FAILED: patch "[PATCH] sched_ext: Fix missing post-enqueue handling in" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x f5e1e5ec204da11fa87fdf006d451d80ce06e118
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025122951-giggle-reveler-2e6b@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f5e1e5ec204da11fa87fdf006d451d80ce06e118 Mon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Thu, 11 Dec 2025 15:45:04 -1000
Subject: [PATCH] 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.
kernel/sched/ext.c +10 -0
@@ -988,6 +988,14 @@ static void local_dsq_post_enq(struct scx_dispatch_q *dsq, struct task_struct *p struct rq *rq = container_of(dsq, struct rq, scx.local_dsq);bool preempt = false; +/* +* If @rq is in balance, the CPU is already vacant and looking for the +* next task to run. No need to preempt or trigger resched after moving +* @p into its local DSQ. +*/ +if (rq->scx.flags &SCX_RQ_IN_BALANCE ) +return ; +if ((enq_flags &SCX_ENQ_PREEMPT ) && p != rq->curr && rq->curr->sched_class == &ext_sched_class) { rq->curr->scx.slice =0 ;
@@ -1636,6 +1644,8 @@ static void move_local_task_to_local_dsq(struct task_struct *p, u64 enq_flags,dsq_mod_nr (dst_dsq,1 ); p->scx.dsq = dst_dsq; + +local_dsq_post_enq (dst_dsq, p, enq_flags); }/**
Sasha Levin
maintainerPATCH 1/2 sched_ext: Factor out local_dsq_post_enq() from dispatch_enqueue()
From: Tejun Heo <[email protected]>
[ Upstream commit 530b6637c79e728d58f1d9b66bd4acf4b735b86d ]
Factor out local_dsq_post_enq() which performs post-enqueue handling for local DSQs - triggering resched_curr() if SCX_ENQ_PREEMPT is specified or if the current CPU is idle. No functional change.
This will be used by the next patch to fix move_local_task_to_local_dsq().
--- kernel/sched/ext.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
kernel/sched/ext.c +19 -15
@@ -1668,6 +1668,22 @@ static void dsq_mod_nr(struct scx_dispatch_q *dsq, s32 delta)WRITE_ONCE (dsq->nr, dsq->nr + delta); } +static void local_dsq_post_enq (struct scx_dispatch_q *dsq,struct task_struct *p, +u64 enq_flags) +{ + struct rq *rq = container_of(dsq, struct rq, scx.local_dsq); +bool preempt = false; + +if ((enq_flags &SCX_ENQ_PREEMPT ) && p != rq->curr && + rq->curr->sched_class == &ext_sched_class) { + rq->curr->scx.slice =0 ; + preempt = true; + } + +if (preempt ||sched_class_above (&ext_sched_class, rq->curr->sched_class)) +resched_curr (rq); +} +static void dispatch_enqueue (struct scx_dispatch_q *dsq,struct task_struct *p,u64 enq_flags) {
@@ -1765,22 +1781,10 @@ static void dispatch_enqueue(struct scx_dispatch_q *dsq, struct task_struct *p,if (enq_flags &SCX_ENQ_CLEAR_OPSS )atomic_long_set_release (&p->scx.ops_state,SCX_OPSS_NONE ); -if (is_local) { - struct rq *rq = container_of(dsq, struct rq, scx.local_dsq); -bool preempt = false; - -if ((enq_flags &SCX_ENQ_PREEMPT ) && p != rq->curr && - rq->curr->sched_class == &ext_sched_class) { - rq->curr->scx.slice =0 ; - preempt = true; - } - -if (preempt ||sched_class_above (&ext_sched_class, - rq->curr->sched_class)) -resched_curr (rq); - }else { +if (is_local) +local_dsq_post_enq (dsq, p, enq_flags); +else raw_spin_unlock (&dsq->lock); - } } static void task_unlink_from_dsq(struct task_struct *p,
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 sched_ext: Fix missing post-enqueue handling in move_local_task_to_local_dsq()
From: Tejun Heo <[email protected]>
[ Upstream commit f5e1e5ec204da11fa87fdf006d451d80ce06e118 ]
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.
--- kernel/sched/ext.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/sched/ext.c +10 -0
@@ -1674,6 +1674,14 @@ static void local_dsq_post_enq(struct scx_dispatch_q *dsq, struct task_struct *p struct rq *rq = container_of(dsq, struct rq, scx.local_dsq);bool preempt = false; +/* +* If @rq is in balance, the CPU is already vacant and looking for the +* next task to run. No need to preempt or trigger resched after moving +* @p into its local DSQ. +*/ +if (rq->scx.flags &SCX_RQ_IN_BALANCE ) +return ; +if ((enq_flags &SCX_ENQ_PREEMPT ) && p != rq->curr && rq->curr->sched_class == &ext_sched_class) { rq->curr->scx.slice =0 ;
@@ -2251,6 +2259,8 @@ static void move_local_task_to_local_dsq(struct task_struct *p, u64 enq_flags,dsq_mod_nr (dst_dsq,1 ); p->scx.dsq = dst_dsq; + +local_dsq_post_enq (dst_dsq, p, enq_flags); }#ifdef CONFIG_SMP
Signature · 1 line
2.51.0