Skip to content

sched_ext: fix kfunc, sub-sched, flatcg and idle-mask issues

Tao Cui bpf lkml sched-ext 1 version Applied

Status from this message: Applied to sched_ext/for-7.4-fixes.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 8 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/6sched_ext: Reject DSQ iterator kfuncs in tracing programskernel/sched/ext/ext.c+6 -21 reply
2/6sched_ext: Make scx_bpf_cid_node() a benign lookup for invalid cidskernel/sched/ext/cid.c+10 -01 reply
3/6sched_ext: Return -EBUSY from a pre-init scx_bpf_sub_caps() readkernel/sched/ext/sub.c+10 -91 reply
4/6sched_ext: Reject cid_online/cid_offline on sub-schedulerskernel/sched/ext/ext.c kernel/sched/ext/internal.h+12 -01 reply
5/6tools/sched_ext: scx_flatcg: Don't strand a cgroup on the ENQ_RACE pathtools/sched_ext/scx_flatcg.bpf.c+15 -21 reply
6/6sched_ext: Clear the built-in idle masks on CPU hotplug transitionskernel/sched/ext/ext.c kernel/sched/ext/idle.c kernel/sched/ext/idle.h+29 -01 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/6] sched_ext: fix kfunc, sub-sched, flatcg and idle-mask issues

From: Tao Cui <[email protected]>

Hello,

This series fixes six issues in the sched_ext core, the scx_flatcg example scheduler and the CID helpers. The core.c fixes travel as a separate series.

The DSQ iterator kfuncs bpf_iter_scx_dsq_next() and bpf_iter_scx_dsq_destroy() take the user DSQ's raw spinlock but stay callable from tracing programs, so a tracing program running while that lock is already held deadlocks the machine. scx_bpf_cid_node() is documented to return NUMA_NO_NODE for an invalid cid but aborts the scheduler instead. A sub-scheduler can declare ops.cid_online()/cid_offline() and read its own caps from ops.init_cids(), but hotplug callbacks are only delivered to the root scheduler and the caps storage isn't up during a self-read, so the callbacks never run and the self-read kills the scheduler. scx_flatcg strands a cgroup off the rbtree on the ENQ_RACE path until the watchdog kills the scheduler, and the built-in idle masks aren't cleared on hotplug, leaving an offline CPU advertised as idle.

0001 rejects the two iterator kfuncs for tracing programs. 0002 makes scx_bpf_cid_node() a benign lookup that returns the documented NUMA_NO_NODE. 0003 returns -EBUSY from a pre-init self-read instead of killing the scheduler. 0004 rejects the hotplug callback declaration on sub-schedulers at load time. 0005 waits for the picker to resolve on ENQ_RACE instead of stranding the cgroup. 0006 clears the built-in idle masks in handle_hotplug() and gates the claim path on cpu_online().

All six are verified in qemu with A/B runs against a stock kernel.

Based on sched_ext/for-next (5b740a72b55c).

Tao Cui (6):
sched_ext: Reject DSQ iterator kfuncs in tracing programs
sched_ext: Make scx_bpf_cid_node() a benign lookup for invalid cids
sched_ext: Return -EBUSY from a pre-init scx_bpf_sub_caps() read
sched_ext: Reject cid_online/cid_offline on sub-schedulers tools/sched_ext: scx_flatcg: Don't strand a cgroup on the ENQ_RACE
path
sched_ext: Clear the built-in idle masks on CPU hotplug transitions

 kernel/sched/ext/cid.c           | 10 ++++++++++
 kernel/sched/ext/ext.c           | 24 ++++++++++++++++++++++--
 kernel/sched/ext/idle.c          | 21 +++++++++++++++++++++
 kernel/sched/ext/idle.h          |  1 +
 kernel/sched/ext/internal.h      |  3 +++
 kernel/sched/ext/sub.c           | 19 ++++++++++---------
 tools/sched_ext/scx_flatcg.bpf.c | 17 +++++++++++++++--
 7 files changed, 82 insertions(+), 13 deletions(-)
Signature · 1 line
2.53.0