Skip to content

Commit 2799d16

Browse files
htejungregkh
authored andcommitted
sched_ext: Fix incorrect assumption about migration disabled tasks in task_can_run_on_remote_rq()
commit f3f08c3 upstream. While fixing migration disabled task handling, 3296682 ("sched_ext: Fix migration disabled handling in targeted dispatches") assumed that a migration disabled task's ->cpus_ptr would only have the pinned CPU. While this is eventually true for migration disabled tasks that are switched out, ->cpus_ptr update is performed by migrate_disable_switch() which is called right before context_switch() in __scheduler(). However, the task is enqueued earlier during pick_next_task() via put_prev_task_scx(), so there is a race window where another CPU can see the task on a DSQ. If the CPU tries to dispatch the migration disabled task while in that window, task_allowed_on_cpu() will succeed and task_can_run_on_remote_rq() will subsequently trigger SCHED_WARN(is_migration_disabled()). WARNING: CPU: 8 PID: 1837 at kernel/sched/ext.c:2466 task_can_run_on_remote_rq+0x12e/0x140 Sched_ext: layered (enabled+all), task: runnable_at=-10ms RIP: 0010:task_can_run_on_remote_rq+0x12e/0x140 ... <TASK> consume_dispatch_q+0xab/0x220 scx_bpf_dsq_move_to_local+0x58/0xd0 bpf_prog_84dd17b0654b6cf0_layered_dispatch+0x290/0x1cfa bpf__sched_ext_ops_dispatch+0x4b/0xab balance_one+0x1fe/0x3b0 balance_scx+0x61/0x1d0 prev_balance+0x46/0xc0 __pick_next_task+0x73/0x1c0 __schedule+0x206/0x1730 schedule+0x3a/0x160 __do_sys_sched_yield+0xe/0x20 do_syscall_64+0xbb/0x1e0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Fix it by converting the SCHED_WARN() back to a regular failure path. Also, perform the migration disabled test before task_allowed_on_cpu() test so that BPF schedulers which fail to handle migration disabled tasks can be noticed easily. While at it, adjust scx_ops_error() message for !task_allowed_on_cpu() case for brevity and consistency. Signed-off-by: Tejun Heo <tj@kernel.org> Fixes: 3296682 ("sched_ext: Fix migration disabled handling in targeted dispatches") Acked-by: Andrea Righi <arighi@nvidia.com> Reported-by: Jake Hillion <jakehillion@meta.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4abbe66 commit 2799d16

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

kernel/sched/ext.c

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2310,6 +2310,25 @@ static bool task_can_run_on_remote_rq(struct task_struct *p, struct rq *rq,
23102310

23112311
SCHED_WARN_ON(task_cpu(p) == cpu);
23122312

2313+
/*
2314+
* If @p has migration disabled, @p->cpus_ptr is updated to contain only
2315+
* the pinned CPU in migrate_disable_switch() while @p is being switched
2316+
* out. However, put_prev_task_scx() is called before @p->cpus_ptr is
2317+
* updated and thus another CPU may see @p on a DSQ inbetween leading to
2318+
* @p passing the below task_allowed_on_cpu() check while migration is
2319+
* disabled.
2320+
*
2321+
* Test the migration disabled state first as the race window is narrow
2322+
* and the BPF scheduler failing to check migration disabled state can
2323+
* easily be masked if task_allowed_on_cpu() is done first.
2324+
*/
2325+
if (unlikely(is_migration_disabled(p))) {
2326+
if (trigger_error)
2327+
scx_ops_error("SCX_DSQ_LOCAL[_ON] cannot move migration disabled %s[%d] from CPU %d to %d",
2328+
p->comm, p->pid, task_cpu(p), cpu);
2329+
return false;
2330+
}
2331+
23132332
/*
23142333
* We don't require the BPF scheduler to avoid dispatching to offline
23152334
* CPUs mostly for convenience but also because CPUs can go offline
@@ -2318,17 +2337,11 @@ static bool task_can_run_on_remote_rq(struct task_struct *p, struct rq *rq,
23182337
*/
23192338
if (!task_allowed_on_cpu(p, cpu)) {
23202339
if (trigger_error)
2321-
scx_ops_error("SCX_DSQ_LOCAL[_ON] verdict target cpu %d not allowed for %s[%d]",
2322-
cpu_of(rq), p->comm, p->pid);
2340+
scx_ops_error("SCX_DSQ_LOCAL[_ON] target CPU %d not allowed for %s[%d]",
2341+
cpu, p->comm, p->pid);
23232342
return false;
23242343
}
23252344

2326-
/*
2327-
* If @p has migration disabled, @p->cpus_ptr only contains its current
2328-
* CPU and the above task_allowed_on_cpu() test should have failed.
2329-
*/
2330-
SCHED_WARN_ON(is_migration_disabled(p));
2331-
23322345
if (!scx_rq_online(rq))
23332346
return false;
23342347

0 commit comments

Comments
 (0)