Skip to contentSkip to conversation

sched_ext: Set up ops.sub_ecaps_updated() dispatch context on the executing CPU

PATCH Applied Tejun Heo 2 participants 3 messages Aug 14

Subsystems (2)
lore
Share & tools
lore

Tejun Heo

author reviewer
#0 lore raw

PATCH 1/1 sched_ext: Set up ops.sub_ecaps_updated() dispatch context on the executing CPU

scx_process_sync_ecaps() sets up the dispatch context for ops.sub_ecaps_updated() in the target cpu's pcpu context recovered from the llist node. However, the context is per executing cpu: the dispatch kfuncs resolve it with this_cpu_ptr() and the dispatch buffer lives in it. What the dispatches target is determined by the rq recorded in the context, not by which cpu's context it is. Under core scheduling the pick runs balance_one() for sibling rqs, so a sync processed for a sibling invokes the op with the executing cpu's context not set up and its dispatch kfuncs misoperate on a NULL or stale rq.

Set up the executing cpu's dsp_ctx instead, matching scx_dispatch_sched(). The recorded rq keeps the dispatches targeting the synced cpu.

Fixes b81a6c018cde ("sched_ext: Add sub_ecaps_updated() effective-cap change notifier")
---
 kernel/sched/ext/sub.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/sched/ext/sub.c +5 -1
@@ -1017,11 +1017,15 @@ void scx_process_sync_ecaps(struct rq *r
 		 * invocation is equivalent to the dispatch path and may drop
 		 * and re-acquire the rq lock temporarily while the rest of
 		 * @batch is held privately, see scx_discard_ecaps_to_sync().
+		 * The dispatch kfuncs resolve their context on the executing
+		 * cpu, which under core scheduling can differ from @rq's cpu,
+		 * so the context is set up there. The rq recorded in it keeps
+		 * the dispatches targeting @rq.
 		 */
 		if (ecaps != pcpu->reported_ecaps &&
 		    SCX_HAS_OP(pcpu->sch, sub_ecaps_updated) &&
 		    !scx_bypassing(pcpu->sch, cpu)) {
-			struct scx_dsp_ctx *dspc = &pcpu->dsp_ctx;
+			struct scx_dsp_ctx *dspc = &this_cpu_ptr(pcpu->sch->pcpu)->dsp_ctx;
 
 			dspc->rq = rq;
 			/* stash @prev so nested dispatches can access it */
Signature · 1 line
2.55.0
author reviewer Applied
#1 lore raw

Applied to sched_ext/for-7.3.

Thanks.

--
tejun

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Tejun Heo

Hi Tejun,

Quoted 10 lines · Tejun Heo

scx_process_sync_ecaps() sets up the dispatch context for ops.sub_ecaps_updated() in the target cpu's pcpu context recovered from the llist node. However, the context is per executing cpu: the dispatch kfuncs resolve it with this_cpu_ptr() and the dispatch buffer lives in it. What the dispatches target is determined by the rq recorded in the context, not by which cpu's context it is. Under core scheduling the pick runs balance_one() for sibling rqs, so a sync processed for a sibling invokes the op with the executing cpu's context not set up and its dispatch kfuncs misoperate on a NULL or stale rq.

Quoted 7 lines

Set up the executing cpu's dsp_ctx instead, matching scx_dispatch_sched(). The recorded rq keeps the dispatches targeting the synced cpu.

Fixes b81a6c018cde ("sched_ext: Add sub_ecaps_updated() effective-cap change notifier")

Everything looks correct to me.

Thanks,
-Andrea

Quoted 26 lines
---
 kernel/sched/ext/sub.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/sched/ext/sub.c +5 -1
@@ -1017,11 +1017,15 @@ void scx_process_sync_ecaps(struct rq *r
 		 * invocation is equivalent to the dispatch path and may drop
 		 * and re-acquire the rq lock temporarily while the rest of
 		 * @batch is held privately, see scx_discard_ecaps_to_sync().
+		 * The dispatch kfuncs resolve their context on the executing
+		 * cpu, which under core scheduling can differ from @rq's cpu,
+		 * so the context is set up there. The rq recorded in it keeps
+		 * the dispatches targeting @rq.
 		 */
 		if (ecaps != pcpu->reported_ecaps &&
 		    SCX_HAS_OP(pcpu->sch, sub_ecaps_updated) &&
 		    !scx_bypassing(pcpu->sch, cpu)) {
-			struct scx_dsp_ctx *dspc = &pcpu->dsp_ctx;
+			struct scx_dsp_ctx *dspc = &this_cpu_ptr(pcpu->sch->pcpu)->dsp_ctx;
 
 			dspc->rq = rq;
 			/* stash @prev so nested dispatches can access it */
Signature · 2 lines
-- 
2.55.0