Skip to contentSkip to conversation

sched_ext: Reset dsq_vtime and slice when a task leaves SCX

PATCH Applied Andrea Righi 2 participants 2 messages Jun 8 – Jun 24

Subsystems (2)
lore
Share & tools
lore

Andrea Righi

author reviewer
#0 lore raw

PATCH v2 1/1 sched_ext: Reset dsq_vtime and slice when a task leaves SCX

When a task leaves the BPF scheduler's control, p->scx.dsq_vtime and p->scx.slice keep whatever values they last held. The slice value is core-managed and is refilled on the next enqueue, but dsq_vtime is owned by the BPF scheduler and is never cleared by the core, so a task that leaves SCX and later returns carries a stale dsq_vtime across the round-trip.

The stale values are also visible to other SCX schedulers that inspect the scx fields of non-SCX tasks.

Fix this by resetting both dsq_vtime and slice in scx_disable_task(), after ops.disable(), so the BPF scheduler can still observe the task's final values and non-SCX tasks do not retain stale SCX state.

---
Changes in v2:
- Reset SCX values in scx_disable_task() (Sashiko)
- Link to v1: https://lore.kernel.org/all/[email protected]/

 kernel/sched/ext.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/sched/ext.c +7 -0
index 8e88a25bc602f..01b4f29de073c 100644
@@ -3659,6 +3659,13 @@ static void scx_disable_task(struct scx_sched *sch, struct task_struct *p)
 		SCX_CALL_OP_TASK(sch, disable, rq, p);
 	scx_set_task_state(p, SCX_TASK_READY);
 
+	/*
+	 * Reset the SCX-managed fields when @p leaves the BPF scheduler's
+	 * control, after ops.disable() has observed their final values.
+	 */
+	p->scx.dsq_vtime = 0;
+	p->scx.slice = 0;
+
 	/*
 	 * Verify the task is not in BPF scheduler's custody. If flag
 	 * transitions are consistent, the flag should always be clear
Signature · 1 line
2.54.0
reviewer Applied
#1 lore raw

Applied to sched_ext/for-7.2-fixes.

Thanks.

--
tejun