tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sched_ext-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext

Pull sched_ext fixes from Tejun Heo:

- Fix build failure when !FAIR_GROUP_SCHED && EXT_GROUP_SCHED

- Revert "sched_ext: Skip per-CPU tasks in scx_bpf_reenqueue_local()"
which was causing issues with per-CPU task scheduling and reenqueuing
behavior

* tag 'sched_ext-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext:
sched_ext, sched/core: Fix build failure when !FAIR_GROUP_SCHED && EXT_GROUP_SCHED
Revert "sched_ext: Skip per-CPU tasks in scx_bpf_reenqueue_local()"

Linus Torvalds 37889cea 05950213

+2 -6
+1 -1
kernel/sched/core.c
··· 9551 9551 #ifdef CONFIG_FAIR_GROUP_SCHED 9552 9552 return scale_load_down(tg->shares); 9553 9553 #else 9554 - return sched_weight_from_cgroup(tg->scx_weight); 9554 + return sched_weight_from_cgroup(tg->scx.weight); 9555 9555 #endif 9556 9556 } 9557 9557
+1 -5
kernel/sched/ext.c
··· 6788 6788 * CPUs disagree, they use %ENQUEUE_RESTORE which is bypassed to 6789 6789 * the current local DSQ for running tasks and thus are not 6790 6790 * visible to the BPF scheduler. 6791 - * 6792 - * Also skip re-enqueueing tasks that can only run on this 6793 - * CPU, as they would just be re-added to the same local 6794 - * DSQ without any benefit. 6795 6791 */ 6796 - if (p->migration_pending || is_migration_disabled(p) || p->nr_cpus_allowed == 1) 6792 + if (p->migration_pending) 6797 6793 continue; 6798 6794 6799 6795 dispatch_dequeue(rq, p);