From 915feb4119e09292f0b0a7392120a7995dc3114a Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 9 Jul 2026 12:06:11 -1000 Subject: [PATCH] sched_ext: Rename extra_enq_flags to remote_activate_enq_flags scx_rq.extra_enq_flags carries scx-specific enqueue flags across the activate_task() boundary during a cross-rq task move in move_remote_task_to_local_dsq(). Rename it to remote_activate_enq_flags to name that role, and fix the stale comment that referenced the old move_task_to_local_dsq() name. No functional change. Signed-off-by: Tejun Heo Reviewed-by: Andrea Righi --- kernel/sched/ext/ext.c | 10 +++++----- kernel/sched/sched.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/sched/ext/ext.c b/kernel/sched/ext/ext.c index 806e8ae1cf33..dbf2f52388df 100644 --- a/kernel/sched/ext/ext.c +++ b/kernel/sched/ext/ext.c @@ -1836,7 +1836,7 @@ static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int core_enq_ { struct scx_sched *sch = scx_task_sched(p); int sticky_cpu = p->scx.sticky_cpu; - u64 enq_flags = core_enq_flags | rq->scx.extra_enq_flags; + u64 enq_flags = core_enq_flags | rq->scx.remote_activate_enq_flags; if (enq_flags & ENQUEUE_WAKEUP) rq->scx.flags |= SCX_RQ_IN_WAKEUP; @@ -2108,13 +2108,13 @@ static void move_remote_task_to_local_dsq(struct task_struct *p, u64 enq_flags, /* * We want to pass scx-specific enq_flags but activate_task() will * truncate the upper 32 bit. As we own @rq, we can pass them through - * @rq->scx.extra_enq_flags instead. + * @rq->scx.remote_activate_enq_flags instead. */ WARN_ON_ONCE(!cpumask_test_cpu(cpu_of(dst_rq), p->cpus_ptr)); - WARN_ON_ONCE(dst_rq->scx.extra_enq_flags); - dst_rq->scx.extra_enq_flags = enq_flags; + WARN_ON_ONCE(dst_rq->scx.remote_activate_enq_flags); + dst_rq->scx.remote_activate_enq_flags = enq_flags; activate_task(dst_rq, p, 0); - dst_rq->scx.extra_enq_flags = 0; + dst_rq->scx.remote_activate_enq_flags = 0; } /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 56acf502ba26..80b72d934ff3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -797,7 +797,8 @@ struct scx_rq { struct list_head runnable_list; /* runnable tasks on this rq */ struct list_head ddsp_deferred_locals; /* deferred ddsps from enq */ unsigned long ops_qseq; - u64 extra_enq_flags; /* see move_task_to_local_dsq() */ + /* see move_remote_task_to_local_dsq() */ + u64 remote_activate_enq_flags; u32 nr_running; u32 cpuperf_target; /* [0, SCHED_CAPACITY_SCALE] */ bool in_select_cpu;