Skip to content

Commit f5e1e5e

Browse files
committed
sched_ext: Fix missing post-enqueue handling in move_local_task_to_local_dsq()
move_local_task_to_local_dsq() is used when moving a task from a non-local DSQ to a local DSQ on the same CPU. It directly manipulates the local DSQ without going through dispatch_enqueue() and was missing the post-enqueue handling that triggers preemption when SCX_ENQ_PREEMPT is set or the idle task is running. The function is used by move_task_between_dsqs() which backs scx_bpf_dsq_move() and may be called while the CPU is busy. Add local_dsq_post_enq() call to move_local_task_to_local_dsq(). As the dispatch path doesn't need post-enqueue handling, add SCX_RQ_IN_BALANCE early exit to keep consume_dispatch_q() behavior unchanged and avoid triggering unnecessary resched when scx_bpf_dsq_move() is used from the dispatch path. Fixes: 4c30f5c ("sched_ext: Implement scx_bpf_dispatch[_vtime]_from_dsq()") Cc: stable@vger.kernel.org # v6.12+ Reviewed-by: Andrea Righi <arighi@nvidia.com> Reviewed-by: Emil Tsalapatis <emil@etsalapatis.com> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 530b663 commit f5e1e5e

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

kernel/sched/ext.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,14 @@ static void local_dsq_post_enq(struct scx_dispatch_q *dsq, struct task_struct *p
988988
struct rq *rq = container_of(dsq, struct rq, scx.local_dsq);
989989
bool preempt = false;
990990

991+
/*
992+
* If @rq is in balance, the CPU is already vacant and looking for the
993+
* next task to run. No need to preempt or trigger resched after moving
994+
* @p into its local DSQ.
995+
*/
996+
if (rq->scx.flags & SCX_RQ_IN_BALANCE)
997+
return;
998+
991999
if ((enq_flags & SCX_ENQ_PREEMPT) && p != rq->curr &&
9921000
rq->curr->sched_class == &ext_sched_class) {
9931001
rq->curr->scx.slice = 0;
@@ -1636,6 +1644,8 @@ static void move_local_task_to_local_dsq(struct task_struct *p, u64 enq_flags,
16361644

16371645
dsq_mod_nr(dst_dsq, 1);
16381646
p->scx.dsq = dst_dsq;
1647+
1648+
local_dsq_post_enq(dst_dsq, p, enq_flags);
16391649
}
16401650

16411651
/**

0 commit comments

Comments
 (0)