Skip to content

Commit be632d8

Browse files
committed
sched_ext: idle: Handle migration-disabled tasks in BPF code
JIRA: https://issues.redhat.com/browse/RHEL-111810 commit 55ed11b Author: Andrea Righi <arighi@nvidia.com> Date: Sat Sep 20 15:26:21 2025 +0200 sched_ext: idle: Handle migration-disabled tasks in BPF code When scx_bpf_select_cpu_dfl()/and() kfuncs are invoked outside of ops.select_cpu() we can't rely on @p->migration_disabled to determine if migration is disabled for the task @p. In fact, migration is always disabled for the current task while running BPF code: __bpf_prog_enter() disables migration and __bpf_prog_exit() re-enables it. To handle this, when @p->migration_disabled == 1, check whether @p is the current task. If so, migration was not disabled before entering the callback, otherwise migration was disabled. This ensures correct idle CPU selection in all cases. The behavior of ops.select_cpu() remains unchanged, because this callback is never invoked for the current task and migration-disabled tasks are always excluded. Example: without this change scx_bpf_select_cpu_and() called from ops.enqueue() always returns -EBUSY; with this change applied, it correctly returns idle CPUs. Fixes: 06efc9f ("sched_ext: idle: Handle migration-disabled tasks in idle selection") Cc: stable@vger.kernel.org # v6.16+ Signed-off-by: Andrea Righi <arighi@nvidia.com> Acked-by: Changwoo Min <changwoo@igalia.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Phil Auld <pauld@redhat.com>
1 parent 02d59e3 commit be632d8

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

kernel/sched/ext_idle.c

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,32 @@ static bool check_builtin_idle_enabled(void)
856856
return false;
857857
}
858858

859+
/*
860+
* Determine whether @p is a migration-disabled task in the context of BPF
861+
* code.
862+
*
863+
* We can't simply check whether @p->migration_disabled is set in a
864+
* sched_ext callback, because migration is always disabled for the current
865+
* task while running BPF code.
866+
*
867+
* The prolog (__bpf_prog_enter) and epilog (__bpf_prog_exit) respectively
868+
* disable and re-enable migration. For this reason, the current task
869+
* inside a sched_ext callback is always a migration-disabled task.
870+
*
871+
* Therefore, when @p->migration_disabled == 1, check whether @p is the
872+
* current task or not: if it is, then migration was not disabled before
873+
* entering the callback, otherwise migration was disabled.
874+
*
875+
* Returns true if @p is migration-disabled, false otherwise.
876+
*/
877+
static bool is_bpf_migration_disabled(const struct task_struct *p)
878+
{
879+
if (p->migration_disabled == 1)
880+
return p != current;
881+
else
882+
return p->migration_disabled;
883+
}
884+
859885
static s32 select_cpu_from_kfunc(struct task_struct *p, s32 prev_cpu, u64 wake_flags,
860886
const struct cpumask *allowed, u64 flags)
861887
{
@@ -898,7 +924,7 @@ static s32 select_cpu_from_kfunc(struct task_struct *p, s32 prev_cpu, u64 wake_f
898924
* selection optimizations and simply check whether the previously
899925
* used CPU is idle and within the allowed cpumask.
900926
*/
901-
if (p->nr_cpus_allowed == 1 || is_migration_disabled(p)) {
927+
if (p->nr_cpus_allowed == 1 || is_bpf_migration_disabled(p)) {
902928
if (cpumask_test_cpu(prev_cpu, allowed ?: p->cpus_ptr) &&
903929
scx_idle_test_and_clear_cpu(prev_cpu))
904930
cpu = prev_cpu;

0 commit comments

Comments
 (0)