sched: Make proxy execution compatible with sched_ext
Subsystems (3)
Andrea Righi
reviewerPATCH v6 1/1 sched: Make proxy execution compatible with sched_ext
This series enables using proxy execution with sched_ext and is based on early work by John Stultz [1].
Background
==========
Proxy execution (proxy-exec) lets a waiting task ("donor") donate its scheduling context to a mutex owner, so the owner can run while the donor stays eligible on the runqueue.
Currently, proxy-exec and sched_ext are mutually exclusive at build time: we can't enable CONFIG_SCHED_PROXY_EXEC=y and CONFIG_SCHED_CLASS_EXT=y in the same kernel.
This restriction can be problematic for Linux distributions and for anyone who wants to ship one kernel and choose features at runtime.
Why are they mutually exclusive?
================================
sched_ext schedulers drive dispatch through their own interfaces. A proxy-exec handoff can run a task that the BPF scheduler never dispatched through that path. sched_ext callbacks then observe a "current" task that does not match what the BPF side considers running, so kfuncs and helper state can see an inconsistent view of the executing task.
sched_ext also tracks runnable work through Dispatch Queues (DSQs) and BPF chosen dispatch rules, while the core scheduler still maintains classic per-CPU runqueues and pick paths. A proxy handoff can therefore switch the CPU to a task that the BPF scheduler never inserted or ordered through its DSQ interface.
DSQ state, vtime, and "who is running" bookkeeping inside the BPF program can then disagree with what the core actually executes, so helpers and kfuncs that assume their dispatched task is current may observe stale or inconsistent state.
Design: supporting proxy-exec with sched_ext
============================================
Provide proxy-exec in sched_ext as optional per-scheduler capability: a BPF scheduler can set the ops flag SCX_OPS_ENQ_BLOCKED to keep mutex-blocked donors runnable and receive them through ops.enqueue() with SCX_ENQ_BLOCKED set.
This flag requires an ops.enqueue() callback and gives BPF control over whether, where, and in what order to dispatch each donor. The core then walks the mutex-owner chain and, when needed, migrates the donor's scheduling context to the owner's rq before executing the owner.
Without the SCX_OPS_ENQ_BLOCKED flag, mutex waiters block normally and do not participate in proxy-exec while owned by that scheduler.
The donor-to-owner handoff is modeled like a "function call" from the scheduler's perspective. The donor remains the running scheduling entity selected by BPF: its scheduling context, runtime and slice are consumed while the core temporarily invokes the mutex owner's code to make the critical section progress. It is not a scheduler-visible switch to the owner.
Accordingly, the donor remains the scheduling context presented to sched_ext, while the mutex owner is treated solely as the execution context selected internally by the core scheduler. Scheduling state is accounted against rq->donor where appropriate, while rq->curr identifies the execution context. The internal owner substitution does not generate synthetic sched_ext callbacks for a task that BPF did not dispatch.
The sched_ext callback bookkeeping is adjusted accordingly. Blocked proxy donors do not generate spurious ops.running() callbacks and ops.stopping() is only called for tasks that entered a tracked ops.running()/stopping() session. This state is independent of physical rq->curr execution, which may refer to the mutex owner instead of the donor.
NOHZ CFS bandwidth checks also follow rq->donor rather than rq->curr, so a bandwidth-constrained FAIR donor keeps the tick running while an owner executes on its behalf.
Scheduler ownership changes need special handling because a donor may already be blocked when a root scheduler is enabled, when a task moves between root and sub-schedulers, or when PI de-boosting moves it into EXT. If the incoming scheduler does not set SCX_OPS_ENQ_BLOCKED, the retained donor is removed from the runqueue and stays on the normal mutex wait path. Otherwise it remains eligible for BPF admission.
scx_qmap has been modified with a -B option to enable queueing mutex-blocked tasks for proxy-exec. Blocked donors receive a fresh slice, are inserted at the head of their current cid's local DSQ and request immediate preemption. This is an intentionally aggressive policy for making proxy-exec easy to observe.
A new kselftest (enq_blocked) is also introduced to validate proxy-exec with sched_ext. The test creates a priority inversion with a low-priority owner (nice +19), a high-priority donor (nice -20) and one nice 0 contender per allowed CPU. It exercises a same-CPU topology and a cross-CPU topology, where the donor and owner run on different CPUs. Each configuration runs with SCX_OPS_ENQ_BLOCKED first disabled and then enabled, counts blocked-donor enqueues by CPU and reports mutex hold/wait-time deltas. Access to the mutex is provided by a loadable kernel module built via TEST_GEN_MODS_DIR, with the test responsible for its lifecycle.
Example kselftest run:
===== START =====
TEST: enq_blocked
DESCRIPTION: Verify proxy donor admission under CPU-wide contention OUTPUT:
[topology=same-cpu SCX_OPS_ENQ_BLOCKED=disabled]
proxy_exec=enabled
donor_cpu=0
owner_cpu=0
nr_contenders=16
measured_trials=10
owner_nice=19
donor_nice=-20
contender_nice=0 mutex_hold_avg_ns=263587544 (263.587 ms, samples=10) mutex_wait_avg_ns=263597934 (263.597 ms, samples=10) nr_blocked_enqueues=0 nr_blocked_enqueues_donor_cpu=0 nr_blocked_enqueues_owner_cpu=0 nr_blocked_enqueues_other_cpu=0 nr_blocked_wakeups=0
[topology=same-cpu SCX_OPS_ENQ_BLOCKED=enabled]
proxy_exec=enabled
donor_cpu=0
owner_cpu=0
nr_contenders=16
measured_trials=10
owner_nice=19
donor_nice=-20
contender_nice=0 mutex_hold_avg_ns=251789178 (251.789 ms, samples=10) mutex_wait_avg_ns=209808599 (209.808 ms, samples=10) nr_blocked_enqueues=60 nr_blocked_enqueues_donor_cpu=60 nr_blocked_enqueues_owner_cpu=0 nr_blocked_enqueues_other_cpu=0 nr_blocked_wakeups=0
[topology=same-cpu delta: enabled - disabled]
mutex_hold_delta_ns=-11798366 (-4.48%)
mutex_wait_delta_ns=-53789335 (-20.41%)
[topology=cross-cpu SCX_OPS_ENQ_BLOCKED=disabled]
proxy_exec=enabled
donor_cpu=0
owner_cpu=1
nr_contenders=16
measured_trials=10
owner_nice=19
donor_nice=-20
contender_nice=0 mutex_hold_avg_ns=246794454 (246.794 ms, samples=10) mutex_wait_avg_ns=247298497 (247.298 ms, samples=10) nr_blocked_enqueues=0 nr_blocked_enqueues_donor_cpu=0 nr_blocked_enqueues_owner_cpu=0 nr_blocked_enqueues_other_cpu=0 nr_blocked_wakeups=0
[topology=cross-cpu SCX_OPS_ENQ_BLOCKED=enabled]
proxy_exec=enabled
donor_cpu=0
owner_cpu=1
nr_contenders=16
measured_trials=10
owner_nice=19
donor_nice=-20
contender_nice=0 mutex_hold_avg_ns=215486809 (215.486 ms, samples=10) mutex_wait_avg_ns=215498090 (215.498 ms, samples=10) nr_blocked_enqueues=80 nr_blocked_enqueues_donor_cpu=20 nr_blocked_enqueues_owner_cpu=60 nr_blocked_enqueues_other_cpu=0 nr_blocked_wakeups=0
[topology=cross-cpu delta: enabled - disabled]
mutex_hold_delta_ns=-31307645 (-12.69%)
mutex_wait_delta_ns=-31800407 (-12.86%)
ok 1 enq_blocked #
===== END =====
=============================
RESULTS:
PASSED: 1 SKIPPED: 0 FAILED: 0
References
==========
[1] https://lore.kernel.org/all/[email protected]
Git tree: git://git.kernel.org/pub/scm/linux/kernel/git/arighi/linux.git scx-proxy-exec
Changes in v6:
- Add a scheduler-core fix to make NOHZ CFS bandwidth checks follow the proxy donor instead of the physical execution context (sashiko)
- Block retained donors when entering sched_ext through PI de-boosting or global scheduler activation (sashiko)
- Distinguish ordinary wakeup activations from retained-donor admissions so SCX_ENQ_BLOCKED is not reported for normal wakeups; extend the selftest to detect this regression (sashiko)
- Validate unexpected-CPU blocked-donor enqueues in both same-CPU and cross-CPU test topologies (sashiko)
- Link to v5: https://lore.kernel.org/all/[email protected]/
Changes in v5:
- Split retained-donor deactivation and sched_ext's default rejection into preparatory patches so the scheduler-core changes can be routed separately
- Drop the proxy destination query kfuncs and the preparatory mutex lock-scope change (John Stultz)
- Use p->is_blocked instead of task_is_blocked() to fix a WARN triggered during scx_pair testing (John Stultz)
- Rename SCX_TASK_IS_RUNNING to SCX_TASK_RUN_TRACKED and document that it tracks an ops.running()/stopping() session rather than physical rq->curr execution
- Keep a proxy-migrated blocked donor on the owner's rq until wakeup instead of allowing BPF-directed migration to pull it back to wake_cpu and cause repeated donor migration
- Extend kselftest to cover same-CPU and cross-CPU proxy-exec switches
- Make scx_qmap insert blocked donors at the head of their current cid's local DSQ and request immediate preemption
- Link to v4: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Harden scx_bpf_task_proxy_cpu() locking and blocked-state validation, return -ENOENT for unrunnable owners and drop unnecessary donor-affinity checks (K Prateek Nayak, sashiko)
- Reschedule remote CPUs after donor deactivation, handle sched_setscheduler() admission and assert scheduler-change locking (sashiko)
- Avoid a potential KCSAN data-race report in the lockless blocked-donor migration check by using rcu_access_pointer() for rq->donor (sashiko)
- Fix tick dependency updates for incoming EXT contexts and keep the tick enabled for blocked donors (sashiko)
- Dump EXT donors in scx_dump_state() (sashiko)
- Reordered the preparatory sched_ext changes so real running-state tracking is established before donor-based accounting, and split the proxy destination query kfuncs into a separate patch
- Add compatibility wrappers for the proxy CPU/cid kfuncs and document their results as scheduling hints
- Link to v3: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Dropped the core restrictions on proxy-migrating migration-disabled and single-CPU donors: proxy execution moves the scheduling context, not the task's execution context. (Peter Zijlstra, K Prateek Nayak)
- Dropped the sched_ext-specific put_prev_task()/set_next_task() exception and fixed ops.running()/ops.stopping() pairing inside sched_ext instead; track a real running transition even when either callback is absent. (Peter Zijlstra)
- Dropped the kf_tasks[] nesting and nested ops.runnable() patches from v2; extensive proxy-exec testing did not reproduce task-op re-entry, so retain the existing non-nesting invariant.
- Replaced scx_bpf_task_is_blocked() with SCX_ENQ_BLOCKED in ops.enqueue() flags, identifying blocked-donor admission directly at enqueue time.
- Expanded the curr/donor description to cover mixed scheduling classes and fixed local preemption to expire rq->donor's slice. (Aiqun Maria Yu)
- Allow inactive blocked donors to be placed on a remote local DSQ while preventing normal migration of an active rq donor. (Aiqun Maria Yu)
- Deactivate retained donors when ownership changes to a root or sub-scheduler without SCX_OPS_ENQ_BLOCKED, and extend the selftest to cover attaching a scheduler after the donor blocks. (K Prateek Nayak)
- Harden remote DSQ consumption by rejecting active tasks and rechecking migration eligibility after locking the source rq. Fall back to the global DSQ without treating an eligibility change during the lock handoff as a BPF scheduler error.
- scx_qmap has a command line option (-B) to enable blocked-donor queueing
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Rebased onto sched_ext/for-7.3 and adapted the series to the split sched_ext implementation and cid-form scheduler interfaces.
- Replaced the global sched_proxy_exec_scx boot-time opt-in with the per-scheduler SCX_OPS_ENQ_BLOCKED capability, allowing BPF to control donor admission and ordering through ops.enqueue().
- Added scx_bpf_task_is_blocked(), scx_bpf_task_proxy_cpu(), and scx_bpf_task_proxy_cid(); enforce CPU/cid API separation for cid-form schedulers.
- Added proxy exec support to scx_qmap, including optional owner-cid steering, affinity validation, and fallback to the donor's current cid.
- Added a kselftest with a kernel mutex test and a three-task priority inversion workload, test is executed with blocked task admission disabled and enabled, validates the behavior, and reports hold/wait-time deltas.
- Link to v1: https://lore.kernel.org/all/[email protected]/
Andrea Righi (10):
sched: Add helper to block retained proxy donors
sched: Make NOHZ CFS bandwidth checks follow proxy donor
sched_ext: Block proxy donors across scheduler transitions
sched_ext: Fix ops.running/stopping() pairing for proxy-exec donors
sched_ext: Split curr|donor references properly
sched_ext: Fix TOCTOU race in consume_remote_task()
sched_ext: Delegate proxy donor admission to BPF schedulers
sched_ext: Add selftest for blocked donor admission
sched_ext: scx_qmap: Add proxy execution support
sched: Allow enabling proxy exec with sched_ext
John Stultz (1):
sched_ext: Handle blocked donor migration with proxy execution
include/linux/sched/ext.h | 3 + init/Kconfig | 2 - kernel/sched/core.c | 62 +- kernel/sched/ext/ext.c | 276 ++++++- kernel/sched/ext/ext.h | 6 + kernel/sched/ext/internal.h | 23 +- kernel/sched/ext/sub.c | 12 +- kernel/sched/sched.h | 6 + kernel/sched/syscalls.c | 3 + tools/sched_ext/include/scx/compat.h | 1 + tools/sched_ext/include/scx/enum_defs.autogen.h | 1 + tools/sched_ext/include/scx/enums.autogen.bpf.h | 3 + tools/sched_ext/include/scx/enums.autogen.h | 1 + tools/sched_ext/scx_qmap.bpf.c | 16 + tools/sched_ext/scx_qmap.c | 8 +- tools/testing/selftests/sched_ext/.gitignore | 4 + tools/testing/selftests/sched_ext/Makefile | 2 + tools/testing/selftests/sched_ext/config | 2 + .../testing/selftests/sched_ext/enq_blocked.bpf.c | 116 +++ tools/testing/selftests/sched_ext/enq_blocked.c | 908 +++++++++++++++++++++ tools/testing/selftests/sched_ext/enq_blocked.h | 27 + .../selftests/sched_ext/test_modules/Makefile | 13 + .../sched_ext/test_modules/scx_enq_blocked_test.c | 193 +++++ 23 files changed, 1630 insertions(+), 58 deletions(-) create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.bpf.c create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.c create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.h create mode 100644 tools/testing/selftests/sched_ext/test_modules/Makefile create mode 100644 tools/testing/selftests/sched_ext/test_modules/scx_enq_blocked_test.c
Andrea Righi
reviewerPATCH 1/11 sched: Make NOHZ CFS bandwidth checks follow proxy donor
Proxy execution separates the scheduling context in rq->donor from the physical execution context in rq->curr. sched_can_stop_tick() checks the latter for CFS bandwidth constraints and only does so when nr_running is one.
A retained proxy donor keeps both the donor and mutex owner queued. The check therefore misses a constrained FAIR donor and may stop the tick while its runtime still needs to be enforced.
Check the selected donor instead and remove the nr_running restriction. The donor being a queued FAIR task is sufficient to require bandwidth accounting regardless of other runnable tasks.
--- kernel/sched/core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/sched/core.c +9 -9
@@ -1409,11 +1409,8 @@ static void nohz_csd_func(void *info)#endif /* CONFIG_NO_HZ_COMMON */ #ifdef CONFIG_NO_HZ_FULL -static inline bool __need_bw_check (struct rq *rq,struct task_struct *p) +static inline bool __need_bw_check (struct task_struct *p) { -if (rq->nr_running !=1 ) -return false; -if (p->sched_class != &fair_sched_class)return false;
@@ -1462,14 +1459,17 @@ bool sched_can_stop_tick(struct rq *rq)return false;/* -* If there is one task and it has CFS runtime bandwidth constraints -* and it's on the cpu now we don't want to stop the tick. +* If the selected scheduling context has CFS runtime bandwidth +* constraints, don't stop the tick. With proxy execution, rq->donor is +* the selected scheduling context while rq->curr is the task physically +* executing on its behalf. +* * This check prevents clearing the bit if a newly enqueued task here is -* dequeued by migrating while the constrained task continues to run. +* dequeued by migrating while the constrained donor continues to run. * E.g. going from 2->1 without going through pick_next_task(). */ -if (__need_bw_check (rq, rq->curr)) { -if (cfs_task_bw_constrained (rq->curr)) +if (__need_bw_check (rq->donor)) { +if (cfs_task_bw_constrained (rq->donor))return false; }
Signature · 1 line
2.55.0
Andrea Righi
reviewerPATCH 2/11 sched: Add helper to block retained proxy donors
In reply to Andrea RighiScheduler ownership changes may need to turn a mutex-blocked task retained on the runqueue for proxy execution back into a normally blocked task.
Add sched_proxy_block_task() to perform that transition while holding p->pi_lock and the task's runqueue lock. Move an active donor off the CPU first, and complete any delayed dequeue so a following sched_change cannot preserve and re-enqueue the task.
This is a preparatory change to support proxy execution with sched_ext.
--- kernel/sched/core.c | 39 +++++++++++++++++++++++++++++++++++++++ kernel/sched/sched.h | 6 ++++++ 2 files changed, 45 insertions(+)
kernel/sched/core.c +39 -0
@@ -6764,6 +6764,45 @@ static void proxy_deactivate(struct rq *rq, struct task_struct *donor)block_task (rq, donor, state); } +/* +* Remove a retained proxy donor before changing its scheduler ownership. +* The caller holds p->pi_lock, so p cannot wake and migrate after block_task() +* drops it from the runqueue. +* +* Unlike the regular schedule() path, this must leave @p fully dequeued. +* DELAY_DEQUEUE may keep a blocked fair task queued with sched_delayed set, +* which would let the following sched_change preserve and re-enqueue it under +* the new scheduler. Complete an existing or newly-created delayed dequeue +* before returning. +*/ +void sched_proxy_block_task (struct rq *rq,struct task_struct *p) +{ +unsigned long state =READ_ONCE (p->__state); + +lockdep_assert_held (&p->pi_lock); +lockdep_assert_rq_held (rq); + +if (!p->is_blocked || !task_on_rq_queued (p)) +return ; +if (WARN_ON_ONCE (state ==TASK_RUNNING )) +return ; + +if (task_current_donor (rq, p)) { +proxy_resched_idle (rq); +/* Kick the execution context if @rq is remote. */ +resched_curr (rq); + } + +if (!p->se.sched_delayed) +block_task (rq, p, state); +if (p->se.sched_delayed) +dequeue_task (rq, p,DEQUEUE_SLEEP |DEQUEUE_DELAYED | +DEQUEUE_NOCLOCK ); + +WARN_ON_ONCE (task_on_rq_queued (p)); +WARN_ON_ONCE (p->se.sched_delayed); +} +static inline void proxy_release_rq_lock (struct rq *rq,struct rq_flags *rf)__releases (__rq_lockp (rq)) {
kernel/sched/sched.h +6 -0
@@ -2478,6 +2478,12 @@ static inline bool task_is_blocked(struct task_struct *p)return !!p->blocked_on; } +#ifdef CONFIG_SCHED_PROXY_EXEC +void sched_proxy_block_task (struct rq *rq,struct task_struct *p); +#else +static inline void sched_proxy_block_task (struct rq *rq,struct task_struct *p) {} +#endif +static inline int task_on_cpu (struct rq *rq,struct task_struct *p) {return p->on_cpu;
Signature · 1 line
2.55.0
K Prateek Nayak
reviewerRe: [PATCH 02/11] sched: Add helper to block retained proxy donors
Hello Andrea,
Quoted 15 lines · Andrea Righi
kernel/sched/core.c +15
-0+/* +* Remove a retained proxy donor before changing its scheduler ownership. +* The caller holds p->pi_lock, so p cannot wake and migrate after block_task() +* drops it from the runqueue. +* +* Unlike the regular schedule() path, this must leave @p fully dequeued. +* DELAY_DEQUEUE may keep a blocked fair task queued with sched_delayed set, +* which would let the following sched_change preserve and re-enqueue it under +* the new scheduler. Complete an existing or newly-created delayed dequeue +* before returning. +*/ +void sched_proxy_block_task (struct rq *rq,struct task_struct *p) +{ +unsigned long state =READ_ONCE (p->__state); +
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6791
Quoted 10 lines
kernel/sched/core.c +10
-0+lockdep_assert_held (&p->pi_lock); +lockdep_assert_rq_held (rq); + +if (!p->is_blocked || !task_on_rq_queued (p)) +return ; +if (WARN_ON_ONCE (state ==TASK_RUNNING )) +return ; + +if (task_current_donor (rq, p)) { +proxy_resched_idle (rq);
This should be proxy_reset_donor() else the current may try to do a sched_yield() with idle as donor and you'll try calling idle class' yield which will crash.
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6800
Quoted 9 lines
kernel/sched/core.c +9
-0+/* Kick the execution context if @rq is remote. */ +resched_curr (rq); + } + +if (!p->se.sched_delayed) +block_task (rq, p, state); +if (p->se.sched_delayed) +dequeue_task (rq, p,DEQUEUE_SLEEP |DEQUEUE_DELAYED | +DEQUEUE_NOCLOCK );
nit.
This case gets dealt by the sched_change_begin() which happens right after scx_prepare_setscheduler(). Do we really need it here?
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6803
Quoted 3 lines
kernel/sched/core.c +3
-0+ +WARN_ON_ONCE (task_on_rq_queued (p)); +WARN_ON_ONCE (p->se.sched_delayed);
Very defensive :-) I personally think on_rq check should be sufficient. Delayed but not on_rq would scream at wakeup.
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6808
Quoted 5 lines
kernel/sched/core.c +2
-0+} +static inline void proxy_release_rq_lock (struct rq *rq,struct rq_flags *rf)__releases (__rq_lockp (rq)) {
Also kudos with the sched_ext + proxy demo. Very impressive to see that latency reduction.
Signature · 2 lines
Thanks and Regards, Prateek
Andrea Righi
reviewerRe: [PATCH 02/11] sched: Add helper to block retained proxy donors
Hi Prateek,
Quoted 24 lines · K Prateek Nayak
Hello Andrea,
Quoted 21 lines · Andrea Righi
kernel/sched/core.c +21
-0+/* +* Remove a retained proxy donor before changing its scheduler ownership. +* The caller holds p->pi_lock, so p cannot wake and migrate after block_task() +* drops it from the runqueue. +* +* Unlike the regular schedule() path, this must leave @p fully dequeued. +* DELAY_DEQUEUE may keep a blocked fair task queued with sched_delayed set, +* which would let the following sched_change preserve and re-enqueue it under +* the new scheduler. Complete an existing or newly-created delayed dequeue +* before returning. +*/ +void sched_proxy_block_task (struct rq *rq,struct task_struct *p) +{ +unsigned long state =READ_ONCE (p->__state); + +lockdep_assert_held (&p->pi_lock); +lockdep_assert_rq_held (rq); + +if (!p->is_blocked || !task_on_rq_queued (p)) +return ; +if (WARN_ON_ONCE (state ==TASK_RUNNING ))
Quoted 8 lines
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6791
Quoted 4 lines
kernel/sched/core.c +4
-0+return ; + +if (task_current_donor (rq, p)) { +proxy_resched_idle (rq);This should be
proxy_reset_donor()else the current may try to do asched_yield()with idle as donor and you'll try calling idle class' yield which will crash.
Good catch! I'll fix this in the next version.
Quoted 13 lines
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6800
Quoted 10 lines
kernel/sched/core.c +9
-0+/* Kick the execution context if @rq is remote. */ +resched_curr (rq); + } + +if (!p->se.sched_delayed) +block_task (rq, p, state); +if (p->se.sched_delayed) +dequeue_task (rq, p,DEQUEUE_SLEEP |DEQUEUE_DELAYED | +DEQUEUE_NOCLOCK );nit.
Quoted 2 lines
This case gets dealt by the
sched_change_begin()which happens right afterscx_prepare_setscheduler(). Do we really need it here?
You're right. All callers immediately follow this with sched_change_begin(). On a FAIR-to-EXT transition, switching_from_fair() completes the delayed dequeue before sched_change_begin() snapshots the queued state. And EXT-to-EXT changes can't have sched_delayed set. I'll drop the redundant dequeue and update the comment accordingly.
Quoted 7 lines
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6803
Quoted 4 lines
kernel/sched/core.c +3
-0+ +WARN_ON_ONCE (task_on_rq_queued (p)); +WARN_ON_ONCE (p->se.sched_delayed);Very defensive :-) I personally think
on_rqcheck should be sufficient. Delayed but noton_rqwould scream at wakeup.
Right, sched_delayed implies on_rq, so the second check was redundant.
With the explicit dequeue_task() removed per your previous comment, a FAIR task may remain queued with sched_delayed until the immediately following sched_change_begin() calls switching_from_fair(), so we should probably check WARN_ON_ONCE(task_on_rq_queued(p) && !p->se.sched_delayed) here.
Quoted 9 lines
kernel/sched/core.c static void proxy_deactivate(struct rq *rq, struct task_struct *donor) · line 6808
Quoted 6 lines
kernel/sched/core.c +2
-0+} +static inline void proxy_release_rq_lock (struct rq *rq,struct rq_flags *rf)__releases (__rq_lockp (rq)) {Also kudos with the
sched_ext+ proxy demo. Very impressive to see that latency reduction.
Ah that was a bit of a synthetic setup, but I needed something to show that the numbers move in the right direction with this whole thing. :)
Thanks for taking a look at this!
-Andrea
Andrea Righi
reviewerPATCH 3/11 sched_ext: Block proxy donors across scheduler transitions
In reply to Andrea RighiProxy execution retains mutex-blocked donors on the runqueue so their scheduling context can execute a lock owner. sched_ext cannot safely retain such donors unless the BPF scheduler explicitly participates in their admission and ordering.
Make sched_ext reject retained donors by default. Force blocked EXT tasks through the regular block path in schedule(), and fully deactivate a retained donor before sched_setscheduler(), PI de-boosting, or global activation moves it into the EXT class. These hooks establish the safe default that a later opt-in can relax.
This is a preparatory change to support proxy execution with sched_ext.
--- kernel/sched/core.c | 5 ++++- kernel/sched/ext/ext.c | 44 +++++++++++++++++++++++++++++++++++++++++ kernel/sched/ext/ext.h | 6 ++++++ kernel/sched/syscalls.c | 3 +++ 4 files changed, 57 insertions(+), 1 deletion(-)
kernel/sched/core.c +4 -1
@@ -7173,7 +7173,8 @@ static void __sched notrace __schedule(int sched_mode)* task_is_blocked() will always be false). */ try_to_block_task (rq, prev, &prev_state, - !task_is_blocked (prev)); + !task_is_blocked (prev) || + !scx_allow_proxy_exec (prev)); switch_count = &prev->nvcsw; }
@@ -7726,6 +7727,8 @@ void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task)if (prev_class != next_class) queue_flag |=DEQUEUE_CLASS ; +scx_prepare_setscheduler (p, next_class); + scoped_guard (sched_change, p, queue_flag) {/* * Boosting condition are:
kernel/sched/ext/ext.c +44 -0
56 lines not on this page · raw message
kernel/sched/ext/ext.h +6 -0
@@ -18,8 +18,11 @@ bool scx_can_stop_tick(struct rq *rq);void scx_rq_activate (struct rq *rq);void scx_rq_deactivate (struct rq *rq);int scx_check_setscheduler (struct task_struct *p,int policy); +void scx_prepare_setscheduler (struct task_struct *p, +const struct sched_class *next_class);bool task_should_scx (int policy);bool scx_allow_ttwu_queue (const struct task_struct *p); +bool scx_allow_proxy_exec (const struct task_struct *p);void init_sched_ext_class (void );static inline u32 scx_cpuperf_target (s32 cpu)
@@ -52,8 +55,11 @@ static inline bool scx_can_stop_tick(struct rq *rq) { return true; }static inline void scx_rq_activate (struct rq *rq) {}static inline void scx_rq_deactivate (struct rq *rq) {}static inline int scx_check_setscheduler (struct task_struct *p,int policy) {return 0 ; } +static inline void scx_prepare_setscheduler (struct task_struct *p, +const struct sched_class *next_class) {}static inline bool task_on_scx (const struct task_struct *p) {return false; }static inline bool scx_allow_ttwu_queue (const struct task_struct *p) {return true; } +static inline bool scx_allow_proxy_exec (const struct task_struct *p) {return true; }static inline void init_sched_ext_class (void ) {}#endif /* CONFIG_SCHED_CLASS_EXT */
kernel/sched/syscalls.c +3 -0
@@ -678,6 +678,9 @@ int __sched_setscheduler(struct task_struct *p,if (prev_class != next_class) queue_flags |=DEQUEUE_CLASS ; +if (!(attr->sched_flags &SCHED_FLAG_KEEP_PARAMS )) +scx_prepare_setscheduler (p, next_class); + scoped_guard (sched_change, p, queue_flags) {if (!(attr->sched_flags &SCHED_FLAG_KEEP_PARAMS )) {
Signature · 1 line
2.55.0
Andrea Righi
reviewerPATCH 4/11 sched_ext: Fix ops.running/stopping() pairing for proxy-exec donors
In reply to Andrea RighiWith proxy-exec, pick_next_task() can return a task with p->is_blocked set (a proxy donor). put_prev_set_next_task() then calls set_next_task_scx() on this "ghost" task even though the task only provides scheduling context and never actually runs.
Calling ops.running() for such a donor produces a spurious running event. Simply suppressing ops.running() is not sufficient because the following put_prev_task_scx() would still invoke ops.stopping(), resulting in an unpaired stopping event.
Introduce SCX_TASK_RUN_TRACKED to track whether a task entered an ops.running()/stopping() session. Set and clear the flag independently of ops.running() and ops.stopping(), as the callbacks are independently optional. Invoke ops.running() only for non-blocked tasks and invoke ops.stopping() only after entering a tracked session. This keeps the callbacks paired for proxy donors while preserving stopping notifications for schedulers which only implement ops.stopping().
This is a preparatory change for enabling proxy execution together with sched_ext. The explicit running-state tracking is also required by later donor-based accounting: it prevents an EXT owner executing for a non-EXT donor from being treated as the active EXT scheduling context when it is dequeued.
--- include/linux/sched/ext.h | 2 ++ kernel/sched/ext/ext.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-)
include/linux/sched/ext.h +2 -0
@@ -103,6 +103,8 @@ enum scx_ent_flags {SCX_TASK_SUB_INIT =1 <<4 ,/* task being initialized for a sub sched */ SCX_TASK_IMMED =1 <<5 ,/* task is on local DSQ with %SCX_ENQ_IMMED */ + SCX_TASK_RUN_TRACKED = 1 << 6, /* task is in an ops.running()/stopping() session */ +/* * Bits 8 to 10 are used to carry task state: *
kernel/sched/ext/ext.c +25 -8
@@ -2208,9 +2208,13 @@ static bool dequeue_task_scx(struct rq *rq, struct task_struct *p, int core_deq_* information meaningful to the BPF scheduler and can be suppressed by * skipping the callbacks if the task is !QUEUED. */ -if (SCX_HAS_OP (sch, stopping) &&task_current (rq, p)) { -update_curr_scx (rq); -SCX_CALL_OP_TASK (sch, stopping, rq, p, false); +if (task_current (rq, p) && + (p->scx.flags &SCX_TASK_RUN_TRACKED )) { +if (SCX_HAS_OP (sch, stopping)) { +update_curr_scx (rq); +SCX_CALL_OP_TASK (sch, stopping, rq, p, false); + } + p->scx.flags &= ~SCX_TASK_RUN_TRACKED ; }if (SCX_HAS_OP (sch, quiescent) && !task_on_rq_migrating (p))
@@ -2912,9 +2916,17 @@ static void set_next_task_scx(struct rq *rq, struct task_struct *p, bool first) p->se.exec_start =rq_clock_task (rq); -/* see dequeue_task_scx() on why we skip when !QUEUED */ -if (SCX_HAS_OP (sch, running) && (p->scx.flags &SCX_TASK_QUEUED )) -SCX_CALL_OP_TASK (sch, running, rq, p); +/* +* See dequeue_task_scx() for why we skip when !QUEUED. A blocked proxy +* donor is also skipped because it provides scheduling context but never +* runs itself. +*/ +if ((p->scx.flags &SCX_TASK_QUEUED ) && !p->is_blocked) { +if (SCX_HAS_OP (sch, running)) +SCX_CALL_OP_TASK (sch, running, rq, p); + + p->scx.flags |=SCX_TASK_RUN_TRACKED ; + }clr_task_runnable (p, true);
@@ -3020,8 +3032,13 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p,update_curr_scx (rq);/* see dequeue_task_scx() on why we skip when !QUEUED */ -if (SCX_HAS_OP (sch, stopping) && (p->scx.flags &SCX_TASK_QUEUED )) -SCX_CALL_OP_TASK (sch, stopping, rq, p, true); +if ((p->scx.flags &SCX_TASK_QUEUED ) && + (p->scx.flags &SCX_TASK_RUN_TRACKED )) { +if (SCX_HAS_OP (sch, stopping)) +SCX_CALL_OP_TASK (sch, stopping, rq, p, true); + + p->scx.flags &= ~SCX_TASK_RUN_TRACKED ; + }if (p->scx.flags &SCX_TASK_QUEUED ) {set_task_runnable (rq, p);
Signature · 1 line
2.55.0
Andrea Righi
reviewerPATCH 5/11 sched_ext: Fix TOCTOU race in consume_remote_task()
In reply to Andrea RighiWhen pulling a task from a non-local DSQ, scx_consume_dispatch_q() checks whether the task can run on the destination rq via task_can_run_on_remote_rq(). However, it then drops the destination rq lock and switches to the source rq lock in consume_remote_task(). During this window, the task might become migration disabled, making it invalid to migrate to the destination rq.
With proxy execution enabled, a mutex-intensive workload such as stress-ng --pipeherd 0 can trigger this race when a donor becomes active on its source rq during the unlocked window. Migrating the active execution context can make it resume with IRQ and preemption state from the wrong scheduling path, triggering sleeping-while-atomic warnings and subsequent lockdep corruption.
Re-evaluate task_can_run_on_remote_rq() after locking the source rq. Use a non-enforcing check because eligibility may have changed during the lock handoff independently of BPF policy; reporting that transient race through scx_error() would unnecessarily abort the scheduler. If the task can no longer migrate, clear its DSQ association, reset the holding CPU, and enqueue it to the global DSQ instead. Normal consumption filtering then skips it on ineligible CPUs while allowing an eligible CPU to pick it without forcing it onto the source local DSQ.
Also reject tasks which are currently executing. Although an on-CPU task should normally not be available for remote DSQ consumption, checking it explicitly prevents a stale or racy candidate from reaching deactivate_task() and set_task_cpu().
Closing the race and preserving rq tracking across the lock handoff are prerequisites for correctly supporting proxy execution with sched_ext.
--- kernel/sched/ext/ext.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
kernel/sched/ext/ext.c +29 -2
@@ -2363,8 +2363,10 @@ static void move_remote_task_to_local_dsq(struct scx_sched *sch,* - The BPF scheduler is bypassed while the rq is offline and we can always say * no to the BPF scheduler initiated migrations while offline. * -* The caller must ensure that @p and @rq are on different CPUs. -* If enforce == true, caller must hold @p's rq lock. +* The caller must ensure that @p and @rq are on different CPUs. If @enforce is +* true, report violations attributable to BPF-directed migrations. The caller +* must hold @p's rq lock to avoid reporting a transient race as a scheduler +* error. */ static bool task_can_run_on_remote_rq(struct scx_sched *sch, struct task_struct *p, struct rq *rq,
@@ -2382,6 +2384,10 @@ static bool task_can_run_on_remote_rq(struct scx_sched *sch,WARN_ON_ONCE (task_cpu (p) == cpu); +/* Don't migrate a task which is running on a CPU. */ +if (task_on_cpu (task_rq (p), p)) +return false; +/* * If @p has migration disabled, @p->cpus_ptr is updated to contain only * the pinned CPU in migrate_disable_switch() while @p is being switched
@@ -2480,6 +2486,27 @@ static bool consume_remote_task(struct scx_sched *sch, struct rq *this_rq, struct scx_dispatch_q *dsq, struct rq *src_rq) { if (unlink_dsq_and_switch_rq_lock(p, dsq, this_rq, src_rq)) { +/* +* Eligibility may have changed while switching rq locks. This is a +* kernel-side race, not an invalid BPF placement request, so don't +* abort the scheduler on failure. Fall back to the global DSQ, where +* normal consumption filters can select an eligible CPU without +* forcing the task onto the source local DSQ. +*/ +if (unlikely (!task_can_run_on_remote_rq (sch, p, this_rq, false))) { + p->scx.dsq =NULL ; + p->scx.holding_cpu =-1 ; +scx_dispatch_enqueue (sch, src_rq, +find_global_dsq (sch,task_cpu (p)), p, + enq_flags |SCX_ENQ_CLEAR_OPSS | +SCX_ENQ_GDSQ_FALLBACK ); +if (sched_class_above (p->sched_class, + src_rq->donor->sched_class)) +resched_curr (src_rq); +switch_rq_lock (src_rq, this_rq); +return false; + } +move_remote_task_to_local_dsq (sch, p, enq_flags, src_rq, this_rq);return true; } else {
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 05/11] sched_ext: Fix TOCTOU race in consume_remote_task()
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [High] Lost wakeup / scheduler stall when a task is skipped during DSQ consumption. - [High] List…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [High] Lost wakeup / scheduler stall when a task is skipped during DSQ consumption.
- [High] List corruption and state machine violation due to enqueuing an actively executing task to the global DSQ. --
--- Patch [5]: [PATCH 05/11] sched_ext: Fix TOCTOU race in consume_remote_task() --- commit b2d369cbc11d2586ba8175f09e54ae5417c87ff8
Author: Andrea Righi <[email protected]>
sched_ext: Fix TOCTOU race in consume_remote_task()
This commit addresses a TOCTOU race when migrating a task during DSQ consumption. It re-evaluates task_can_run_on_remote_rq() after locking the source runqueue and falls back to enqueuing the task on the global DSQ if the task is no longer eligible to migrate.
Quoted 4 lines
kernel/sched/ext/ext.c +0
-0
[ ... ]
kernel/sched/ext/ext.c static bool task_can_run_on_remote_rq(struct scx_sched *sch, · line 2390
Quoted 8 lines
kernel/sched/ext/ext.c +4
-0@@ -2382,6 +2384,10 @@ static bool task_can_run_on_remote_rq(struct scx_sched *sch,WARN_ON_ONCE (task_cpu (p) == cpu); +/* Don't migrate a task which is running on a CPU. */ +if (task_on_cpu (task_rq (p), p)) +return false; +
[Severity: High]
Could returning false here cause a lost wakeup or scheduler stall?
When a task is preempted and enqueued to a non-local DSQ, an idle CPU might attempt to consume it from scx_consume_dispatch_q() before the previous CPU completes finish_task_switch() (which clears p->on_cpu).
Since scx_consume_dispatch_q() evaluates task_can_run_on_remote_rq() locklessly, it would return false, causing the consuming CPU to skip the task and potentially go back to sleep. Once the previous CPU finally clears p->on_cpu, is there a mechanism to generate a new kick, or will the task remain stranded on the dispatch queue indefinitely?
Quoted 3 lines
kernel/sched/ext/ext.c +0
-0/* * If @p has migration disabled, @p->cpus_ptr is updated to contain only * the pinned CPU in migrate_disable_switch() while @p is being switched
[ ... ]
Quoted 8 lines
kernel/sched/ext/ext.c +4
-0@@ -2480,6 +2486,27 @@ static bool consume_remote_task(struct scx_sched *sch, struct rq *this_rq, struct scx_dispatch_q *dsq, struct rq *src_rq) { if (unlink_dsq_and_switch_rq_lock(p, dsq, this_rq, src_rq)) { +/* +* Eligibility may have changed while switching rq locks. This is a +* kernel-side race, not an invalid BPF placement request, so don't +* abort the scheduler on failure. Fall back to the global DSQ, where
kernel/sched/ext/ext.c static bool consume_remote_task(struct scx_sched *sch, struct rq *this_rq, · line 2502
Quoted 10 lines
kernel/sched/ext/ext.c +10
-0+* normal consumption filters can select an eligible CPU without +* forcing the task onto the source local DSQ. +*/ +if (unlikely (!task_can_run_on_remote_rq (sch, p, this_rq, false))) { + p->scx.dsq =NULL ; + p->scx.holding_cpu =-1 ; +scx_dispatch_enqueue (sch, src_rq, +find_global_dsq (sch,task_cpu (p)), p, + enq_flags |SCX_ENQ_CLEAR_OPSS | +SCX_ENQ_GDSQ_FALLBACK );
[Severity: High]
Can this fallback path lead to list corruption if the task is actively executing?
If a donor task in a DSQ becomes active (task_on_cpu() is true) during proxy execution, the re-evaluation of task_can_run_on_remote_rq() correctly detects it as executing and returns false.
However, this fallback path will then clear p->scx.dsq and unconditionally enqueue the actively executing task to the global DSQ. When the task is later preempted, put_prev_task_scx() will attempt to enqueue it again, which seems like it would trigger the WARN_ON_ONCE(p->scx.dsq || !list_empty(...)) and corrupt the DSQ list.
Quoted 10 lines
kernel/sched/ext/ext.c +7
-0+if (sched_class_above (p->sched_class, + src_rq->donor->sched_class)) +resched_curr (src_rq); +switch_rq_lock (src_rq, this_rq); +return false; + } +move_remote_task_to_local_dsq (sch, p, enq_flags, src_rq, this_rq);return true; }else {
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Andrea Righi
reviewerPATCH 6/11 sched_ext: Split curr|donor references properly
In reply to Andrea RighiWith proxy execution, the task selected by the scheduler and the task physically executing can differ. A blocked mutex waiter donates its scheduling context to the lock owner:
D -----------------> M -------------> O ----------------> T [donor] blocked on [mutex] owned by [owner] preempted by [task]
\_________________________________^
donates scheduling context
where:
D = blocked donor
M = mutex
O = mutex owner
T = competing runnable task
During a proxy execution switch, D supplies the scheduling class, priority, and runtime budget, while O supplies the execution context: O is the task whose code physically executes. T is a competing runnable task which may preempt the D/O proxy execution.
Consider FAIR and EXT tasks with sched_ext running in partial mode. FAIR can be replaced with a higher scheduling class such as RT or deadline without changing the class interaction described here. The possible combinations are:
1. D is EXT, O is EXT, T is EXT
D can interrupt T according to BPF scheduling policy. O executes with D's EXT priority and runtime budget, while T waits in EXT.
2. D is EXT, O is EXT, T is FAIR
D is visible to the BPF scheduler, but cannot preempt T because EXT is below FAIR. Once T stops, BPF can dispatch D and O executes with D's EXT priority and runtime budget. If T becomes runnable again, it preempts the D/O proxy execution.
3. D is EXT, O is FAIR, T is EXT
This cannot represent T preempting O because EXT is below FAIR.
4. D is EXT, O is FAIR, T is FAIR
D cannot boost O above T because EXT is below FAIR. O and T continue competing under FAIR. Once O releases M, D wakes and resumes normal EXT scheduling.
5. D is FAIR, O is EXT, T is EXT
D preempts T as the higher-class scheduling context. O executes with D's FAIR priority and runtime budget, while T waits in EXT. D is not visible to the BPF scheduler.
6. D is FAIR, O is EXT, T is FAIR
D competes with T according to its FAIR deadline. When D is selected, O executes with D's FAIR priority and runtime budget. D is not visible to the BPF scheduler.
7. D is FAIR, O is FAIR, T is EXT
This cannot represent T preempting O because EXT is below FAIR.
8. D is FAIR, O is FAIR, T is FAIR
O, T, and D all have FAIR scheduling contexts. D remains runnable as a blocked proxy donor. When CFS selects D, O executes using D's FAIR scheduling context. When CFS selects O, O executes using its own FAIR context, and when CFS selects T, T executes normally. D is not visible to the BPF scheduler.
Thus, sched_ext policy and accounting must generally use rq->donor, the scheduler-selected task which supplies the scheduling context, rather than rq->curr, the task whose code physically executes. Without proxy execution they are the same task.
On nohz_full CPUs, a blocked proxy donor must retain the scheduler tick even when it has an infinite slice. Otherwise, a full dynticks CPU could stop the tick while rq->curr and rq->donor differ, violating assumptions made by the remote NOHZ tick path.
This is a conservative compromise that keeps the change local to sched_ext, at the cost of a periodic tick while a blocked proxy donor is selected. Allowing blocked proxy donors to run tickless would require making the core scheduler's remote tick handling aware that rq->curr and rq->donor can differ.
Moreover, extend scx_dump_state() to report both contexts. Each CPU record now includes a donor= line. If an EXT donor differs from rq->curr, also emit its detailed task record. The existing '*' marker continues to identify rq->curr, while the donor= line identifies the otherwise unmarked donor record.
Note that at this point in the series, CONFIG_SCHED_PROXY_EXEC still depends on !CONFIG_SCHED_CLASS_EXT, so proxy execution and sched_ext cannot be enabled together. The scheduling changes are therefore preparatory. A later patch removes this restriction.
--- kernel/sched/ext/ext.c | 67 +++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 24 deletions(-)
kernel/sched/ext/ext.c +43 -24
@@ -1332,20 +1332,27 @@ static void apply_task_slice_oob(struct rq *rq, struct task_struct *p)static void update_curr_scx (struct rq *rq) { -struct task_struct *curr = rq->curr; +struct task_struct *donor;s64 delta_exec; +/* +* update_curr_scx() is selected through rq->donor->sched_class, not +* rq->curr->sched_class, so @donor is always an EXT task here. If an EXT +* owner executes for a FAIR donor, FAIR's update_curr() runs instead. +*/ + donor = rq->donor; +/* apply even on 0 delta_exec, callers may still act on the slice */ -apply_task_slice_oob (rq, curr); +apply_task_slice_oob (rq, donor); delta_exec =update_curr_common (rq);if (unlikely (delta_exec <=0 ))return ; -if (curr->scx.slice !=SCX_SLICE_INF ) { - curr->scx.slice -=min_t (u64, curr->scx.slice, delta_exec); -if (!curr->scx.slice) -touch_core_sched (rq, curr); +if (donor->scx.slice !=SCX_SLICE_INF ) { + donor->scx.slice -=min_t (u64, donor->scx.slice, delta_exec); +if (!donor->scx.slice) +touch_core_sched (rq, donor); }dl_server_update (&rq->ext_server, delta_exec);
@@ -1515,9 +1522,9 @@ static void rq_owned_post_enq(struct scx_sched *sch, struct rq *rq,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) { -set_task_slice (rq->curr,0 ); +if ((enq_flags &SCX_ENQ_PREEMPT ) && p != rq->donor && + rq->donor->sched_class == &ext_sched_class) { +set_task_slice (rq->donor,0 );resched_curr (rq); } }
@@ -2720,7 +2727,8 @@ static void dispatch_to_local_dsq(struct scx_sched *sch, struct rq *rq, }/* if the destination CPU is idle, wake it up */ -if (!fallback &&sched_class_above (p->sched_class, dst_rq->curr->sched_class)) +if (!fallback &&sched_class_above (p->sched_class, + dst_rq->donor->sched_class))resched_curr (dst_rq); }
@@ -2931,6 +2939,7 @@ static int balance_one(struct rq *rq, struct task_struct *prev)static void set_next_task_scx (struct rq *rq,struct task_struct *p,bool first) {struct scx_sched *sch =scx_task_sched (p); +bool can_stop_tick;if (p->scx.flags &SCX_TASK_QUEUED ) {/*
@@ -2959,6 +2968,7 @@ static void set_next_task_scx(struct rq *rq, struct task_struct *p, bool first)/* apply any pending out-of-band slice request before the tick decision */ apply_task_slice_oob (rq, p); + can_stop_tick = p->scx.slice ==SCX_SLICE_INF && !p->is_blocked;/* * @p is getting newly scheduled or got kicked after someone updated its
@@ -2969,7 +2979,7 @@ static void set_next_task_scx(struct rq *rq, struct task_struct *p, bool first)* nohz. In the future, we might want to add a mechanism to update * load_avgs periodically on tick-stopped CPUs. */ -if (p->scx.slice ==SCX_SLICE_INF ) { +if (can_stop_tick) {if (!(rq->scx.flags &SCX_RQ_CAN_STOP_TICK )) {/* * Bypass mode always assigns finite slices, so @p
@@ -2990,7 +3000,8 @@ static void set_next_task_scx(struct rq *rq, struct task_struct *p, bool first)/* * @rq still references the outgoing scheduling context. A finite -* slice is sufficient by itself to require the tick. +* slice or a blocked proxy donor is sufficient by itself to require +* the tick. */ if (tick_nohz_full_cpu (cpu_of (rq)))tick_nohz_dep_set_cpu (cpu_of (rq),TICK_DEP_BIT_SCHED );
@@ -3165,7 +3176,7 @@ static struct task_struct *first_local_task(struct rq *rq)static struct task_struct *do_pick_task_scx (struct rq *rq,struct rq_flags *rf,bool force_scx) { -struct task_struct *prev = rq->curr; +struct task_struct *prev = rq->donor;bool keep_prev;struct task_struct *p;
@@ -3525,9 +3536,9 @@ void scx_tick(struct rq *rq)update_other_load_avgs (rq); } -static void task_tick_scx (struct rq *rq,struct task_struct *curr,int queued) +static void task_tick_scx (struct rq *rq,struct task_struct *donor,int queued) { -struct scx_sched *sch =scx_task_sched (curr); +struct scx_sched *sch =scx_task_sched (donor);update_curr_scx (rq);
@@ -3536,13 +3547,13 @@ static void task_tick_scx(struct rq *rq, struct task_struct *curr, int queued)* we can't trust the slice management or ops.core_sched_before(). */ if (scx_bypassing (sch,cpu_of (rq))) { -set_task_slice (curr,0 ); -touch_core_sched (rq, curr); +set_task_slice (donor,0 ); +touch_core_sched (rq, donor); }else if (SCX_HAS_OP (sch, tick)) { -SCX_CALL_OP_TASK (sch, tick, rq, curr); +SCX_CALL_OP_TASK (sch, tick, rq, donor); } -if (!curr->scx.slice) +if (!donor->scx.slice)resched_curr (rq); }
@@ -4348,14 +4359,14 @@ static void run_deferred(struct rq *rq)#ifdef CONFIG_NO_HZ_FULL bool scx_can_stop_tick (struct rq *rq) { -struct task_struct *p = rq->curr; +struct task_struct *p = rq->donor;struct scx_sched *sch =scx_task_sched (p);if (p->sched_class != &ext_sched_class)return true;/* -* @rq->curr may still reference an outgoing EXT task after it has been +* @rq->donor may still reference an outgoing EXT task after it has been * dequeued. If no EXT tasks are accounted on @rq, ignore its stale * slice state. If another task is dispatched from a DSQ, * set_next_task_scx() will update the dependency for the incoming task.
@@ -4369,7 +4380,8 @@ bool scx_can_stop_tick(struct rq *rq)/* * @rq can dispatch from different DSQs, so we can't tell whether it * needs the tick or not by looking at nr_running. Allow stopping ticks -* iff the BPF scheduler indicated so. See set_next_task_scx(). +* iff set_next_task_scx() determined that the selected scheduling context +* can run tickless. */ return rq->scx.flags &SCX_RQ_CAN_STOP_TICK ; }
@@ -6464,6 +6476,9 @@ static void scx_dump_cpu(struct scx_sched *sch, struct seq_buf *s,dump_line (&ns," curr=%s[%d] class=%ps" , rq->curr->comm, rq->curr->pid, rq->curr->sched_class); +dump_line (&ns," donor=%s[%d] class=%ps" , + rq->donor->comm, rq->donor->pid, + rq->donor->sched_class);if (!cpumask_empty (pcpu->cpus_to_kick))dump_line (&ns," cpus_to_kick : %*pb" ,cpumask_pr_args (pcpu->cpus_to_kick));
@@ -6507,6 +6522,10 @@ static void scx_dump_cpu(struct scx_sched *sch, struct seq_buf *s,if (rq->curr->sched_class == &ext_sched_class && (dump_all_tasks ||scx_task_on_sched (sch, rq->curr)))scx_dump_task (sch, s, dctx, rq, rq->curr,'*' ); +if (rq->donor != rq->curr && + rq->donor->sched_class == &ext_sched_class && + (dump_all_tasks ||scx_task_on_sched (sch, rq->donor))) +scx_dump_task (sch, s, dctx, rq, rq->donor,' ' );list_for_each_entry (p, &rq->scx.runnable_list, scx.runnable_node)if (dump_all_tasks ||scx_task_on_sched (sch, p))
@@ -8019,7 +8038,7 @@ static bool kick_one_cpu(s32 cpu, struct scx_sched_pcpu *pcpu, struct rq *this_runsigned long flags;raw_spin_rq_lock_irqsave (rq, flags); - cur_class = rq->curr->sched_class; + cur_class = rq->donor->sched_class;/* * During CPU hotplug, a CPU may depend on kicking itself to make
@@ -8036,7 +8055,7 @@ static bool kick_one_cpu(s32 cpu, struct scx_sched_pcpu *pcpu, struct rq *this_rif (cur_class == &ext_sched_class) {if (likely (!scx_missing_caps (pcpu->sch, cpu,scx_caps_for_preempt (pcpu->sch, rq)))) -set_task_slice (rq->curr,0 ); +set_task_slice (rq->donor,0 );else __scx_add_event (pcpu->sch,SCX_EV_SUB_PREEMPT_DENIED ,1 );
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 06/11] sched_ext: Split curr|donor references properly
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Incomplete migration from rq->curr to rq->donor for proxy execution breaks capability revocation…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Incomplete migration from rq->curr to rq->donor for proxy execution breaks capability revocation, preemption checks, and BPF kfuncs. --
--- Patch [6]: [PATCH 06/11] sched_ext: Split curr|donor references properly --- commit 8ca59038e09f66e910a65ddcaf538ce84385abf5
Author: Andrea Righi <[email protected]>
sched_ext: Split curr|donor references properly
This commit updates sched_ext to use rq->donor instead of rq->curr where appropriate to correctly handle proxy execution. This ensures that the scheduler-selected task (donor) supplies the scheduling context and budget, even when a different task physically executes on the CPU.
Quoted 4 lines
kernel/sched/ext/ext.c +0
-0
[ ... ]
Quoted 10 lines
kernel/sched/ext/ext.c +1
-1@@ -8030,7 +8049,7 @@ static bool kick_one_cpu(s32 cpu, struct scx_sched_pcpu *pcpu, struct rq *this_runsigned long flags;raw_spin_rq_lock_irqsave (rq, flags); - cur_class = rq->curr->sched_class; + cur_class = rq->donor->sched_class;/* * During CPU hotplug, a CPU may depend on kicking itself to make
kernel/sched/ext/ext.c static bool kick_one_cpu(s32 cpu, struct scx_sched_pcpu *pcpu, struct rq *this_r · line 8072
Quoted 8 lines
kernel/sched/ext/ext.c +1
-1@@ -8047,7 +8066,7 @@ static bool kick_one_cpu(s32 cpu, struct scx_sched_pcpu *pcpu, struct rq *this_rif (cur_class == &ext_sched_class) {if (likely (!scx_missing_caps (pcpu->sch, cpu,scx_caps_for_preempt (pcpu->sch, rq)))) -set_task_slice (rq->curr,0 ); +set_task_slice (rq->donor,0 );else __scx_add_event (pcpu->sch,SCX_EV_SUB_PREEMPT_DENIED ,1 );
[Severity: High]
Should this migration from rq->curr to rq->donor also be applied to other functions that interact with the scheduling context?
For example, in reenq_local(), capability revocation eviction appears to check the physical lock owner instead of the proxy donor:
kernel/sched/ext/ext.c:reenq_local() {
...
if ((reenq_flags & SCX_REENQ_CAP_REVOKE) &&
rq->curr->sched_class == &ext_sched_class &&
scx_task_reenq_on_cap_revoke(rq, rq->curr)) {
set_task_slice(rq->curr, 0);...
}
Could this cause capability revocation to fail for proxy donors executing on behalf of non-EXT tasks?
Similarly, scx_caps_for_preempt() evaluates capabilities against the physical lock owner:
kernel/sched/ext/sub.h:scx_caps_for_preempt() {
struct task_struct *curr = rq->curr;
...
if (curr->sched_class != &ext_sched_class ||...
}
Could this allow unauthorized preemption if the proxy donor is an EXT task but the physical lock owner is a non-EXT task?
Additionally, BPF kfuncs scx_bpf_task_running() and scx_bpf_cpu_curr() report the physical owner instead of the expected scheduling context:
kernel/sched/ext/ext.c:scx_bpf_task_running() {
return task_rq(p)->curr == p;
}kernel/sched/ext/ext.c:scx_bpf_cpu_curr() {
return rcu_dereference(cpu_rq(cpu)->curr);
}Does this expose the physical lock owner instead of the proxy donor context, potentially confusing the BPF scheduler which expects to see the EXT task it dispatched?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Andrea Righi
reviewerPATCH 7/11 sched_ext: Handle blocked donor migration with proxy execution
In reply to Andrea RighiFrom: John Stultz <[email protected]>
With proxy execution enabled, mutex-blocked donors stay runnable so their scheduling context can execute the lock owner.
sched_ext may normally relocate a queued blocked donor. set_task_cpu() updates both task_cpu() and wake_cpu, making the destination rq the donor's new callback home. This remains valid if the donor was previously proxy-migrated: the BPF scheduler is intentionally selecting a new return destination, which the next proxy migration will preserve. The usual migration-disabled, affinity, and rq-online checks apply.
An active donor cannot be moved normally because the source rq still references it through rq->donor for scheduling-class operations and runtime accounting. Moving it would associate the task with a different rq while leaving those source-rq references in place. The core proxy migration path avoids this by switching the rq donor to idle before moving the scheduling context.
Allow normal sched_ext migration of blocked donors unless the donor is active on its rq. In that case, defer migration until it is switched out or leave it to the proxy machinery.
Keep blocked donors on the local DSQ when they are put so they remain visible to the proxy pick path.
--- kernel/sched/ext/ext.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
kernel/sched/ext/ext.c +29 -0
@@ -2395,6 +2395,19 @@ static bool task_can_run_on_remote_rq(struct scx_sched *sch,if (task_on_cpu (task_rq (p), p))return false; +/* +* A blocked donor may be moved normally to select a new callback rq. +* set_task_cpu() updates wake_cpu and makes the destination rq its new +* callback home, even if the donor was previously proxy-migrated. +* +* Don't move an active donor while the source rq still references it for +* scheduling and accounting. The migration can be retried after the donor +* is switched out. +*/ +if (p->is_blocked && +rcu_access_pointer (task_rq (p)->donor) == p) +return false; +/* * If @p has migration disabled, @p->cpus_ptr is updated to contain only * the pinned CPU in migrate_disable_switch() while @p is being switched
@@ -3081,6 +3094,22 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p,if (p->scx.flags &SCX_TASK_QUEUED ) {set_task_runnable (rq, p); +/* +* Mutex-blocked donors stay queued on the runqueue under proxy +* execution, but the donor never runs as itself, proxy-exec +* walks the blocked_on chain on the next __schedule() and runs +* the lock owner in its place. +* +* Put the donor on the local DSQ directly so pick_next_task() +* can still see it. find_proxy_task() will either run the chain +* owner or deactivate the donor so the wakeup path can return it +* and let BPF make a new dispatch decision once it is unblocked. +*/ +if (p->is_blocked) { +scx_dispatch_enqueue (sch, rq, &rq->scx.local_dsq, p,0 ); + goto switch_class; + } +/* * If @p has slice left and is being put, @p is getting * preempted by a higher priority scheduler class or core-sched
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 07/11] sched_ext: Handle blocked donor migration with proxy execution
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider: - [High] Blocked donors are enqueued at the tail of the local DSQ, causing priority inversion. - [High]…
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] Blocked donors are enqueued at the tail of the local DSQ, causing priority inversion.
- [High] Migrated blocked donors are routed to the BPF scheduler, breaking proxy execution visibility.
- [Medium] Spurious zero-slice warning triggered for blocked proxy donors.
--
--- Patch [7]: [PATCH 07/11] sched_ext: Handle blocked donor migration with proxy execution --- commit 9cd5cbb0243a316aab34614eb668cef59ac84d98
Author: John Stultz <[email protected]>
sched_ext: Handle blocked donor migration with proxy execution
With proxy execution enabled, mutex-blocked donors stay runnable so their scheduling context can execute the lock owner. This patch allows normal sched_ext migration of blocked donors unless the donor is active on its rq, and keeps blocked donors on the local DSQ when they are put.
Quoted 4 lines
kernel/sched/ext/ext.c +0
-0
[ ... ]
Quoted 7 lines
kernel/sched/ext/ext.c +3
-0@@ -2395,6 +2395,19 @@ static bool task_can_run_on_remote_rq(struct scx_sched *sch,if (task_on_cpu (task_rq (p), p))return false; +/* +* A blocked donor may be moved normally to select a new callback rq. +* set_task_cpu() updates wake_cpu and makes the destination rq its new
kernel/sched/ext/ext.c static bool task_can_run_on_remote_rq(struct scx_sched *sch, · line 2410
Quoted 10 lines
kernel/sched/ext/ext.c +10
-0+* callback home, even if the donor was previously proxy-migrated. +* +* Don't move an active donor while the source rq still references it for +* scheduling and accounting. The migration can be retried after the donor +* is switched out. +*/ +if (p->is_blocked && +rcu_access_pointer (task_rq (p)->donor) == p) +return false; +
[Severity: High]
When a blocked donor is migrated, is there a risk it gets routed to the BPF scheduler instead of the local DSQ?
If a blocked donor is migrated via sched_setaffinity(), set_task_cpu() migrates it and calls enqueue_task_scx() -> scx_do_enqueue_task() on the destination CPU.
Since there doesn't appear to be a check for p->is_blocked in the enqueue path, the donor would be handed to the BPF scheduler's ops.enqueue callback.
Could the BPF scheduler then place the donor into a user or global DSQ, violating the requirement that the donor remain immediately visible on the local DSQ? This could cause the proxy lock owner to starve until the BPF scheduler arbitrarily decides to dispatch the donor.
Quoted 3 lines
kernel/sched/ext/ext.c +0
-0/* * If @p has migration disabled, @p->cpus_ptr is updated to contain only * the pinned CPU in migrate_disable_switch() while @p is being switched
[ ... ]
Quoted 7 lines
kernel/sched/ext/ext.c +3
-0@@ -3081,6 +3094,22 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p,if (p->scx.flags &SCX_TASK_QUEUED ) {set_task_runnable (rq, p); +/* +* Mutex-blocked donors stay queued on the runqueue under proxy +* execution, but the donor never runs as itself, proxy-exec
kernel/sched/ext/ext.c static void put_prev_task_scx(struct rq *rq, struct task_struct *p, · line 3109
Quoted 10 lines
kernel/sched/ext/ext.c +10
-0+* walks the blocked_on chain on the next __schedule() and runs +* the lock owner in its place. +* +* Put the donor on the local DSQ directly so pick_next_task() +* can still see it. find_proxy_task() will either run the chain +* owner or deactivate the donor so the wakeup path can return it +* and let BPF make a new dispatch decision once it is unblocked. +*/ +if (p->is_blocked) { +scx_dispatch_enqueue (sch, rq, &rq->scx.local_dsq, p,0 );
[Severity: High]
Does enqueuing with enq_flags = 0 place the blocked donor at the tail of the local DSQ?
If there are other tasks already in the local DSQ (for example, dispatched by the BPF scheduler), the donor won't be picked by pick_task_scx() until all preceding tasks are drained.
Since proxy execution requires pick_next_task() to return the donor before find_proxy_task() can run the lock owner, will this delay the lock owner's execution and cause unbounded priority inversion?
Should this use SCX_ENQ_HEAD instead?
[Severity: Medium]
Will this trigger a spurious zero-slice warning if the blocked donor has consumed its time slice?
When a blocked proxy donor consumes its time slice, task_tick_scx() calls resched_curr() to preempt it. put_prev_task_scx() will place the donor here directly into the local DSQ with p->scx.slice == 0.
When do_pick_task_scx() later picks it via first_local_task(), will the unlikely(!p->scx.slice) check hit and trigger the KERN_WARNING, permanently setting sch->warned_zero_slice to true? This would break a useful diagnostic designed to catch BPF scheduler bugs, causing unnecessary kernel log pollution and masking legitimate zero-slice issues.
Quoted 6 lines
kernel/sched/ext/ext.c +3
-0+ goto switch_class; + } +/* * If @p has slice left and is being put, @p is getting * preempted by a higher priority scheduler class or core-sched
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
Andrea Righi
reviewerPATCH 8/11 sched_ext: Delegate proxy donor admission to BPF schedulers
In reply to Andrea RighiProxy execution keeps a blocked donor runnable so its scheduling context can execute the mutex owner. Dispatching sched_ext donors on a local DSQ bypasses the BPF scheduler ordering policy and can give donors more CPU priority than intended to perform the proxy execution handoff.
Add SCX_OPS_ENQ_BLOCKED as an explicit proxy execution capability. Tasks owned by schedulers without the flag block normally. Schedulers with the flag receive blocked donors through ops.enqueue() with SCX_ENQ_BLOCKED set in enq_flags and can apply their own admission policy.
From a high-level perspective, the resulting flow for a BPF scheduler with SCX_OPS_ENQ_BLOCKED is:
D ------ blocked on -----> M ------ owned by -----> O
[donor] [mutex] [owner]
|
| ops.enqueue(D, SCX_ENQ_BLOCKED)
| BPF dispatches D to CPUi
v
+-----------------+
| CPUi local DSQ |
+-------+---------+
|
| pick_next_task() selects D
v
+-----------------+
| proxy exec | move D to O's rq
+-------+---------+
|
| run O using D's scheduling context
v
rq->curr = O
rq->donor = D
|
| O releases M
v
+-----------------+
| proxy exec | return D to CPUi via wakeup
+-----------------+A proxy migration preserves the donor's wake_cpu while moving its scheduling context to the owner's rq, so task_cpu() differs from wake_cpu until the donor wakes. Prevent BPF-directed migrations from pulling a blocked donor off this proxy rq. Otherwise each blocked re-enqueue may move the donor back to its callback rq only for proxy execution to move it to the owner again.
Scheduler ownership can change after a donor has already blocked. Since sched_change preserves queued state, handle both iterator-driven moves to root or sub-schedulers and sched_setscheduler() transitions into EXT. Before entering a scheduler without the flag, deactivate the retained donor. It remains on the mutex wait path and wakes normally when the mutex becomes available.
The global sched_ext enable state can change while __schedule() holds the runqueue lock. Once an EXT task has an assigned scheduler, consult it directly so the task cannot retain a donor during the transition unless the scheduler opted in. Tasks without an assigned scheduler keep the generic proxy execution behavior.
The preparation helpers require and assert that p->pi_lock and p's rq lock are held before updating rq state.
The donor starts associated with its original CPU. A BPF scheduler may dispatch it directly into that CPU local DSQ to let the core resolve the mutex owner and execute it with the donor scheduling context.
A normal sleeper also has p->is_blocked set until after wakeup_preempt(). Exclude full wakeup activations from SCX_ENQ_BLOCKED and carry a transient task flag from enqueue_task_scx() to wakeup_preempt_scx(). Retained donor wakeups skip enqueue_task_scx(), so they remain distinguishable without changing core scheduler wake flags.
Reschedule a retained donor when its mutex wakes it so ops.dispatch() can reconsider the now-unblocked task. Make SCX_OPS_ENQ_BLOCKED override the exiting and migration-disabled enqueue fallbacks so opted-in schedulers receive all eligible donor requests.
--- include/linux/sched/ext.h | 1 + kernel/sched/ext/ext.c | 110 ++++++++++++++---- kernel/sched/ext/internal.h | 23 +++- kernel/sched/ext/sub.c | 12 +- tools/sched_ext/include/scx/compat.h | 1 + .../sched_ext/include/scx/enum_defs.autogen.h | 1 + .../sched_ext/include/scx/enums.autogen.bpf.h | 3 + tools/sched_ext/include/scx/enums.autogen.h | 1 + 8 files changed, 123 insertions(+), 29 deletions(-)
include/linux/sched/ext.h +1 -0
@@ -104,6 +104,7 @@ enum scx_ent_flags {SCX_TASK_IMMED =1 <<5 ,/* task is on local DSQ with %SCX_ENQ_IMMED */ SCX_TASK_RUN_TRACKED =1 <<6 ,/* task is in an ops.running()/stopping() session */ + SCX_TASK_ENQ_WAKEUP = 1 << 7, /* wakeup enqueue awaiting wakeup_preempt() *//* * Bits 8 to 10 are used to carry task state:
kernel/sched/ext/ext.c +85 -25
210 lines not on this page · raw message
kernel/sched/ext/internal.h +22 -1
@@ -213,6 +213,19 @@ enum scx_ops_flags {*/ SCX_OPS_TID_TO_TASK =1LLU <<8 , +/* +* If set, mutex-blocked tasks remain runnable as proxy donors and are +* passed to ops.enqueue() with %SCX_ENQ_BLOCKED. The BPF scheduler controls +* when donors are dispatched and whether they should preempt other work. +* +* If clear, mutex-blocked tasks are removed from the runqueue normally +* and cannot donate their scheduling context through proxy execution. +* +* For blocked donors, this flag takes precedence over +* %SCX_OPS_ENQ_EXITING and %SCX_OPS_ENQ_MIGRATION_DISABLED. +*/ +SCX_OPS_ENQ_BLOCKED =1LLU <<9 , +SCX_OPS_ALL_FLAGS =SCX_OPS_KEEP_BUILTIN_IDLE |SCX_OPS_ENQ_LAST | SCX_OPS_ENQ_EXITING |
@@ -221,7 +234,8 @@ enum scx_ops_flags {SCX_OPS_SWITCH_PARTIAL |SCX_OPS_BUILTIN_IDLE_PER_NODE |SCX_OPS_ALWAYS_ENQ_IMMED | -SCX_OPS_TID_TO_TASK , +SCX_OPS_TID_TO_TASK | +SCX_OPS_ENQ_BLOCKED ,/* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */ __SCX_OPS_INTERNAL_MASK = 0xffLLU << 56,
@@ -1614,6 +1628,12 @@ enum scx_enq_flags {*/ SCX_ENQ_LAST =1LLU <<41 , +/* +* The task is blocked on a mutex and is being kept runnable as a proxy +* donor. Only passed to ops.enqueue() when %SCX_OPS_ENQ_BLOCKED is set. +*/ +SCX_ENQ_BLOCKED =1LLU <<42 , +/* high 8 bits are internal */ __SCX_ENQ_INTERNAL_MASK = 0xffLLU << 56,
@@ -1909,6 +1929,7 @@ void scx_task_iter_start(struct scx_task_iter *iter, struct cgroup *cgrp);void scx_task_iter_unlock (struct scx_task_iter *iter);void scx_task_iter_stop (struct scx_task_iter *iter);struct task_struct *scx_task_iter_next_locked (struct scx_task_iter *iter); +void scx_prepare_task_sched_change (struct task_struct *p,struct scx_sched *sch);void scx_dispatch_dequeue (struct rq *rq,struct task_struct *p);void scx_do_enqueue_task (struct rq *rq,struct task_struct *p,u64 enq_flags,int sticky_cpu);
kernel/sched/ext/sub.c +9 -3
@@ -753,7 +753,9 @@ static void scx_fail_parent(struct scx_sched *sch,if (scx_task_on_sched (parent, p))continue ; - scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE) { +scx_prepare_task_sched_change (p, parent); +scoped_guard (sched_change, p,DEQUEUE_SAVE |DEQUEUE_MOVE | + DEQUEUE_NOCLOCK) {scx_disable_and_exit_task (sch, p);scx_set_task_sched (p, parent); }
@@ -845,7 +847,9 @@ void scx_sub_disable(struct scx_sched *sch)continue ; } - scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE) { +scx_prepare_task_sched_change (p, parent); +scoped_guard (sched_change, p,DEQUEUE_SAVE |DEQUEUE_MOVE | + DEQUEUE_NOCLOCK) {/* * $p is initialized for $parent and still attached to * @sch. Disable and exit for @sch, switch over to
@@ -1172,7 +1176,9 @@ void scx_sub_enable_workfn(struct kthread_work *work)if (!(p->scx.flags &SCX_TASK_SUB_INIT ))continue ; - scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE) { +scx_prepare_task_sched_change (p, sch); +scoped_guard (sched_change, p,DEQUEUE_SAVE |DEQUEUE_MOVE | + DEQUEUE_NOCLOCK) {/* * $p must be either READY or ENABLED. If ENABLED, * __scx_disabled_and_exit_task() first disables and
tools/sched_ext/include/scx/compat.h +1 -0
@@ -117,6 +117,7 @@ static inline bool __COMPAT_struct_has_field(const char *type, const char *field#define SCX_OPS_ALLOW_QUEUED_WAKEUP SCX_OPS_FLAG(SCX_OPS_ALLOW_QUEUED_WAKEUP)#define SCX_OPS_BUILTIN_IDLE_PER_NODE SCX_OPS_FLAG(SCX_OPS_BUILTIN_IDLE_PER_NODE)#define SCX_OPS_ALWAYS_ENQ_IMMED SCX_OPS_FLAG(SCX_OPS_ALWAYS_ENQ_IMMED) +#define SCX_OPS_ENQ_BLOCKED SCX_OPS_FLAG(SCX_OPS_ENQ_BLOCKED)#define SCX_PICK_IDLE_FLAG (name) __COMPAT_ENUM_OR_ZERO("scx_pick_idle_cpu_flags", #name)
tools/sched_ext/include/scx/enum_defs.autogen.h +1 -0
@@ -55,6 +55,7 @@#define HAVE_SCX_ENQ_IMMED #define HAVE_SCX_ENQ_REENQ #define HAVE_SCX_ENQ_LAST +#define HAVE_SCX_ENQ_BLOCKED #define HAVE___SCX_ENQ_INTERNAL_MASK #define HAVE_SCX_ENQ_CLEAR_OPSS #define HAVE_SCX_ENQ_DSQ_PRIQ
tools/sched_ext/include/scx/enums.autogen.bpf.h +3 -0
@@ -130,6 +130,9 @@ const volatile u64 __SCX_ENQ_REENQ __weak;const volatile u64 __SCX_ENQ_LAST__weak ;#define SCX_ENQ_LAST __SCX_ENQ_LAST +const volatile u64 __SCX_ENQ_BLOCKED__weak ; +#define SCX_ENQ_BLOCKED __SCX_ENQ_BLOCKED +const volatile u64 __SCX_ENQ_CLEAR_OPSS__weak ;#define SCX_ENQ_CLEAR_OPSS __SCX_ENQ_CLEAR_OPSS
tools/sched_ext/include/scx/enums.autogen.h +1 -0
@@ -47,6 +47,7 @@SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_IMMED ); \SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_REENQ ); \SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_LAST ); \ +SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_BLOCKED ); \SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_CLEAR_OPSS ); \SCX_ENUM_SET (skel, scx_enq_flags,SCX_ENQ_DSQ_PRIQ ); \SCX_ENUM_SET (skel, scx_deq_flags,SCX_DEQ_SCHED_CHANGE ); \
Signature · 1 line
2.55.0
Andrea Righi
reviewerPATCH 9/11 sched_ext: Add selftest for blocked donor admission
In reply to Andrea RighiSCX_OPS_ENQ_BLOCKED allows BPF schedulers to receive blocked proxy donors through ops.enqueue(). SCX_ENQ_BLOCKED identifies blocked-donor admission requests. Add selftest coverage for this interface.
Exercise a priority inversion using a weighted-vruntime BPF scheduler. A nice +19 owner holds a shared mutex, a nice -20 donor blocks on it, and nice 0 CPU contenders, one per allowed CPU, keep the system busy. Test both a same-CPU topology and a cross-CPU topology with the donor and owner on different CPUs.
Treat blocked donors according to the normal BPF ordering policy and assign the default slice on every enqueue, as for other tasks. Run each CPU placement configuration with SCX_OPS_ENQ_BLOCKED first disabled and then enabled, count blocked-donor enqueues by CPU and report average mutex hold and wait times. Reject enqueues carrying both SCX_ENQ_WAKEUP and SCX_ENQ_BLOCKED, as full wakeups are not retained donor admissions.
Proxy execution coverage requires CONFIG_SCHED_PROXY_EXEC=y, which the selftest config selects. Access to the kernel mutex is provided via a loadable kernel module, built through TEST_GEN_MODS_DIR and managed by the test.
--- tools/testing/selftests/sched_ext/.gitignore | 4 + tools/testing/selftests/sched_ext/Makefile | 2 + tools/testing/selftests/sched_ext/config | 2 + .../selftests/sched_ext/enq_blocked.bpf.c | 116 +++ .../testing/selftests/sched_ext/enq_blocked.c | 908 ++++++++++++++++++ .../testing/selftests/sched_ext/enq_blocked.h | 27 + .../selftests/sched_ext/test_modules/Makefile | 13 + .../test_modules/scx_enq_blocked_test.c | 193 ++++ 8 files changed, 1265 insertions(+) create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.bpf.c create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.c create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.h create mode 100644 tools/testing/selftests/sched_ext/test_modules/Makefile create mode 100644 tools/testing/selftests/sched_ext/test_modules/scx_enq_blocked_test.c
tools/testing/selftests/sched_ext/.gitignore +4 -0
@@ -4,3 +4,7 @@ !Makefile !.gitignore !config +!test_modules/ +!test_modules/scx_enq_blocked_test.c +!test_modules/Makefile +test_modules/*.mod.c
tools/testing/selftests/sched_ext/Makefile +2 -0
@@ -5,6 +5,7 @@ include ../../../scripts/Makefile.arch include ../../../scripts/Makefile.include TEST_GEN_PROGS := runner +TEST_GEN_MODS_DIR := test_modules # override lib.mk's default rules OVERRIDE_TARGETS := 1
@@ -164,6 +165,7 @@ all_test_bpfprogs := $(foreach prog,$(wildcard *.bpf.c),$(INCLUDE_DIR)/$(patsubs auto-test-targets := \ create_dsq \ dequeue \ + enq_blocked \ enq_last_no_enq_fails \ ddsp_bogus_dsq_fail \ ddsp_vtimelocal_fail \
tools/testing/selftests/sched_ext/config +2 -0
@@ -6,3 +6,5 @@ CONFIG_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF=y +CONFIG_EXPERT=y +CONFIG_SCHED_PROXY_EXEC=y
tools/testing/selftests/sched_ext/enq_blocked.bpf.c new file +116 -0
116 lines not on this page · raw message
tools/testing/selftests/sched_ext/enq_blocked.c new file +908 -0
908 lines not on this page · raw message
tools/testing/selftests/sched_ext/enq_blocked.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES */ +#ifndef __ENQ_BLOCKED_H +#define __ENQ_BLOCKED_H + +#include <linux/ioctl.h> +#include <linux/types.h> + +struct enq_blocked_stats { +__u64 hold_time_ns; +__u64 wait_time_ns; +__u64 nr_holds; +__u64 nr_waits; +}; + +#define ENQ_BLOCKED_IOCTL_OWNER _IO('s', 1) +#define ENQ_BLOCKED_IOCTL_DONOR _IO('s', 2) +#define ENQ_BLOCKED_IOCTL_RESET_STATS _IO('s', 3) +#define ENQ_BLOCKED_IOCTL_GET_STATS _IOR('s', 4, struct enq_blocked_stats) +#define ENQ_BLOCKED_IOCTL_PREP_ATTACH _IO('s', 5) +#define ENQ_BLOCKED_IOCTL_ATTACH_DONE _IO('s', 6) +#define ENQ_BLOCKED_IOCTL_DONOR_STATE _IO('s', 7) + +#define ENQ_BLOCKED_DONOR_SLEEPING (1U << 0) +#define ENQ_BLOCKED_DONOR_ON_RQ (1U << 1) + +#endif /* __ENQ_BLOCKED_H */
tools/testing/selftests/sched_ext/test_modules/Makefile new file +13 -0
@@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES + +TESTMODS_DIR := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))) +KDIR ?= $(if $(O),$(O),$(realpath ../../../../..)) + +obj-m += scx_enq_blocked_test.o + +all: + +$(Q)$(MAKE) -C $(KDIR) M=$(TESTMODS_DIR) modules + +clean: + +$(Q)$(MAKE) -C $(KDIR) M=$(TESTMODS_DIR) clean
tools/testing/selftests/sched_ext/test_modules/scx_enq_blocked_test.c new file +193 -0
193 lines not on this page · raw message
Signature · 1 line
2.55.0
Andrea Righi
reviewerPATCH 10/11 sched_ext: scx_qmap: Add proxy execution support
In reply to Andrea RighiAdd a -B option to opt scx_qmap into queueing mutex-blocked tasks for proxy execution. Without the option, SCX_OPS_ENQ_BLOCKED remains clear and mutex waiters block normally. With -B, blocked donors are passed to qmap_enqueue() with SCX_ENQ_BLOCKED.
When scx_qmap receives a blocked donor, dispatch it directly to the local DSQ of its current cid with a fresh slice and SCX_ENQ_PREEMPT. This places the donor at the head of the DSQ and requests an immediate reschedule, allowing the core proxy-exec path to run the mutex owner using the donor's scheduling context as soon as the donor is selected.
The policy is intentionally unfair and can strongly prioritize tasks using contended mutexes, but scx_qmap is a demo scheduler and such aggressive behavior makes proxy-exec support easy to observe.
--- tools/sched_ext/scx_qmap.bpf.c | 16 ++++++++++++++++ tools/sched_ext/scx_qmap.c | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)
tools/sched_ext/scx_qmap.bpf.c +16 -0
@@ -451,6 +451,22 @@ void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags)*/ taskc->core_sched_seq = qa.core_sched_tail_seqs[idx]++; +/* +* Insert a blocked mutex donor at the head of its current cid's local +* DSQ with a fresh slice and %SCX_ENQ_PREEMPT, requesting an immediate +* reschedule. Once selected, the core proxy-exec path can immediately +* run the mutex owner using the donor's scheduling context. +* +* This policy is intentionally unfair and can strongly prioritize tasks +* using contended mutexes; scx_qmap is a demonstration scheduler and +* this behavior makes proxy-exec support easy to observe. +*/ +if (enq_flags &SCX_ENQ_BLOCKED ) { +scx_bpf_dsq_insert (p,SCX_DSQ_LOCAL_ON |scx_bpf_task_cid (p), + slice_ns, enq_flags |SCX_ENQ_PREEMPT ); +return ; + } +/* * A node with children delegates most cids. A task of ours that can run * on none of our self cids (e.g. a per-NUMA kthread pinned to delegated
tools/sched_ext/scx_qmap.c +6 -2
@@ -51,7 +51,7 @@ const char help_fmt[] ="See the top-of-file comment in .bpf.c for the design.\n" "\n" "Usage: %s [-s SLICE_US] [-e COUNT] [-t COUNT] [-T COUNT] [-l COUNT] [-b COUNT]\n" -" [-N COUNT] [-P] [-M] [-H] [-c CG_PATH] [-d PID] [-D LEN] [-S] [-p] [-I]\n" +" [-N COUNT] [-P] [-M] [-H] [-c CG_PATH] [-d PID] [-D LEN] [-S] [-p] [-I] [-B]\n" " [-F COUNT] [-i SEC] [-R MS] [-J MODE] [-v]\n" "\n" " -s SLICE_US Override slice duration\n"
@@ -70,6 +70,7 @@ const char help_fmt[] =" -S Suppress qmap-specific debug dump\n" " -p Switch only tasks on SCHED_EXT policy instead of all\n" " -I Turn on SCX_OPS_ALWAYS_ENQ_IMMED\n" +" -B Turn on SCX_OPS_ENQ_BLOCKED\n" " -F COUNT IMMED stress: force every COUNT'th enqueue to a busy local DSQ (use with -I)\n" " -C MODE cid-override test (shuffle|bad-dup|bad-range|bad-mono)\n" " -i SEC Stats and weight-refresh interval, seconds (default 5)\n"
@@ -336,7 +337,7 @@ int main(int argc, char **argv) skel->rodata->slice_ns =__COMPAT_ENUM_OR_ZERO ("scx_public_consts" ,"SCX_SLICE_DFL" ); skel->rodata->max_tasks =16384 ; -while ((opt =getopt (argc, argv,"s:e:t:T:l:b:N:PMHc:d:D:SpIF:C:i:R:J:vh" )) !=-1 ) { +while ((opt =getopt (argc, argv,"s:e:t:T:l:b:N:PMHc:d:D:SpIBF:C:i:R:J:vh" )) !=-1 ) {switch (opt) {case 's' : skel->rodata->slice_ns =strtoull (optarg,NULL ,0 ) *1000 ;
@@ -398,6 +399,9 @@ int main(int argc, char **argv) skel->rodata->always_enq_immed = true; skel->struct_ops.qmap_ops->flags |=SCX_OPS_ALWAYS_ENQ_IMMED ;break ; +case 'B' : + skel->struct_ops.qmap_ops->flags |=SCX_OPS_ENQ_BLOCKED ; +break ;case 'F' : skel->rodata->immed_stress_nth =strtoul (optarg,NULL ,0 );break ;
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 10/11] sched_ext: scx_qmap: Add proxy execution support
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Infinite re-enqueue loop (hard lockup) for blocked tasks when CPU capability is revoked. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Infinite re-enqueue loop (hard lockup) for blocked tasks when CPU capability is revoked. --
--- Patch [10]: [PATCH 10/11] sched_ext: scx_qmap: Add proxy execution support --- commit 330898ee3998dc8e218d6fe5b7b813cf89e4a38d
Author: Andrea Righi <[email protected]>
sched_ext: scx_qmap: Add proxy execution support
Add a -B option to opt scx_qmap into queueing mutex-blocked tasks for proxy execution. Blocked donors are dispatched directly to the local DSQ of their current cid with a fresh slice and SCX_ENQ_PREEMPT.
Quoted 4 lines
tools/sched_ext/scx_qmap.bpf.c +0
-0
[ ... ]
Quoted 9 lines
tools/sched_ext/scx_qmap.bpf.c +5
-0@@ -451,6 +451,22 @@ void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags)*/ taskc->core_sched_seq = qa.core_sched_tail_seqs[idx]++; +/* +* Insert a blocked mutex donor at the head of its current cid's local +* DSQ with a fresh slice and %SCX_ENQ_PREEMPT, requesting an immediate +* reschedule. Once selected, the core proxy-exec path can immediately +* run the mutex owner using the donor's scheduling context.
tools/sched_ext/scx_qmap.bpf.c void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags) · line 468
Quoted 10 lines
tools/sched_ext/scx_qmap.bpf.c +10
-0+* +* This policy is intentionally unfair and can strongly prioritize tasks +* using contended mutexes; scx_qmap is a demonstration scheduler and +* this behavior makes proxy-exec support easy to observe. +*/ +if (enq_flags &SCX_ENQ_BLOCKED ) { +scx_bpf_dsq_insert (p,SCX_DSQ_LOCAL_ON |scx_bpf_task_cid (p), + slice_ns, enq_flags |SCX_ENQ_PREEMPT ); +return ; + }
[Severity: High]
Can this cause a hard lockup if a sub-scheduler dynamically loses CPU capability?
When a sub-scheduler is used (via the -c option) and loses capability on the task's current CPU, the kernel routes the task to the reject DSQ and re-enqueues it with the SCX_ENQ_REENQ flag.
Since this check unconditionally handles SCX_ENQ_BLOCKED and returns early, won't it bypass the SCX_ENQ_REENQ fallback logic later in qmap_enqueue that normally routes rejected tasks to SHARED_DSQ?
If the sub-scheduler still lacks capability, the kernel will reject it again. Because balance_scx() processes the reject DSQ synchronously until empty, won't this create an infinite re-enqueue loop?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Andrea Righi
reviewerPATCH 11/11 sched: Allow enabling proxy exec with sched_ext
In reply to Andrea RighiNow that sched_ext can handle proxy donors and BPF schedulers can opt in to blocked-donor enqueueing with SCX_OPS_ENQ_BLOCKED, remove the !SCHED_CLASS_EXT dependency from SCHED_PROXY_EXEC and allow both options to be enabled together.
--- init/Kconfig | 2 -- 1 file changed, 2 deletions(-)
init/Kconfig +0 -2
@@ -934,8 +934,6 @@ config SCHED_PROXY_EXEC bool "Proxy Execution" # Avoid some build failures w/ PREEMPT_RT until it can be fixed depends on !PREEMPT_RT - # Need to investigate how to inform sched_ext of split contexts - depends on !SCHED_CLASS_EXT # Not particularly useful until we get to multi-rq proxying depends on EXPERT help
Signature · 1 line
2.55.0