Commit 69d5e722 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

sched/ext: Fix scx vs sched_delayed 



Commit 98442f0c ("sched: Fix delayed_dequeue vs
switched_from_fair()") forgot about scx :/

Fixes: 98442f0c ("sched: Fix delayed_dequeue vs switched_from_fair()")
Reported-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lkml.kernel.org/r/20241030104934.GK14555@noisy.programming.kicks-ass.net
parent 5db91545

kernel/sched/ext.c

+12 −2
Original line number Diff line number Diff line
@@ -4489,11 +4489,16 @@ static void scx_ops_disable_workfn(struct kthread_work *work) 
	scx_task_iter_start(&sti);

	while ((p = scx_task_iter_next_locked(&sti))) {

		const struct sched_class *old_class = p->sched_class;

		const struct sched_class *new_class =

			__setscheduler_class(p->policy, p->prio);

		struct sched_enq_and_set_ctx ctx;



		if (old_class != new_class && p->se.sched_delayed)

			dequeue_task(task_rq(p), p, DEQUEUE_SLEEP | DEQUEUE_DELAYED);



		sched_deq_and_put_task(p, DEQUEUE_SAVE | DEQUEUE_MOVE, &ctx);



		p->sched_class = __setscheduler_class(p->policy, p->prio);

		p->sched_class = new_class;

		check_class_changing(task_rq(p), p, old_class);



		sched_enq_and_set_task(&ctx);
@@ -5199,12 +5204,17 @@ static int scx_ops_enable(struct sched_ext_ops *ops, struct bpf_link *link) 
	scx_task_iter_start(&sti);

	while ((p = scx_task_iter_next_locked(&sti))) {

		const struct sched_class *old_class = p->sched_class;

		const struct sched_class *new_class =

			__setscheduler_class(p->policy, p->prio);

		struct sched_enq_and_set_ctx ctx;



		if (old_class != new_class && p->se.sched_delayed)

			dequeue_task(task_rq(p), p, DEQUEUE_SLEEP | DEQUEUE_DELAYED);



		sched_deq_and_put_task(p, DEQUEUE_SAVE | DEQUEUE_MOVE, &ctx);



		p->scx.slice = SCX_SLICE_DFL;

		p->sched_class = __setscheduler_class(p->policy, p->prio);

		p->sched_class = new_class;

		check_class_changing(task_rq(p), p, old_class);



		sched_enq_and_set_task(&ctx);