Skip to content

Commit ddf7233

Browse files
arighihtejun
authored andcommitted
sched/ext: Fix invalid task state transitions on class switch
When enabling a sched_ext scheduler, we may trigger invalid task state transitions, resulting in warnings like the following (which can be easily reproduced by running the hotplug selftest in a loop): sched_ext: Invalid task state transition 0 -> 3 for fish[770] WARNING: CPU: 18 PID: 787 at kernel/sched/ext.c:3862 scx_set_task_state+0x7c/0xc0 ... RIP: 0010:scx_set_task_state+0x7c/0xc0 ... Call Trace: <TASK> scx_enable_task+0x11f/0x2e0 switching_to_scx+0x24/0x110 scx_enable.isra.0+0xd14/0x13d0 bpf_struct_ops_link_create+0x136/0x1a0 __sys_bpf+0x1edd/0x2c30 __x64_sys_bpf+0x21/0x30 do_syscall_64+0xbb/0x370 entry_SYSCALL_64_after_hwframe+0x77/0x7f This happens because we skip initialization for tasks that are already dead (with their usage counter set to zero), but we don't exclude them during the scheduling class transition phase. Fix this by also skipping dead tasks during class swiching, preventing invalid task state transitions. Fixes: a8532fa ("sched_ext: TASK_DEAD tasks must be switched into SCX on ops_enable") Cc: [email protected] # v6.12+ Signed-off-by: Andrea Righi <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
1 parent 8f5ae30 commit ddf7233

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/sched/ext.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5749,6 +5749,9 @@ static int scx_enable(struct sched_ext_ops *ops, struct bpf_link *link)
57495749
__setscheduler_class(p->policy, p->prio);
57505750
struct sched_enq_and_set_ctx ctx;
57515751

5752+
if (!tryget_task_struct(p))
5753+
continue;
5754+
57525755
if (old_class != new_class && p->se.sched_delayed)
57535756
dequeue_task(task_rq(p), p, DEQUEUE_SLEEP | DEQUEUE_DELAYED);
57545757

@@ -5761,6 +5764,7 @@ static int scx_enable(struct sched_ext_ops *ops, struct bpf_link *link)
57615764
sched_enq_and_set_task(&ctx);
57625765

57635766
check_class_changed(task_rq(p), p, old_class, p->prio);
5767+
put_task_struct(p);
57645768
}
57655769
scx_task_iter_stop(&sti);
57665770
percpu_up_write(&scx_fork_rwsem);

0 commit comments

Comments
 (0)