sched_ext: Add scx_bpf_cid_override() kfunc
Subsystems (2)
Tejun Heo
reviewerPATCH 8/17 sched_ext: Add scx_bpf_cid_override() kfunc
The auto-probed cid mapping reflects the kernel's view of topology (node -> LLC -> core), but a BPF scheduler may want a different layout - to align cid slices with its own partitioning, or to work around how the kernel reports a particular machine.
Add scx_bpf_cid_override(), callable from ops.init() of the root scheduler. It validates the caller-supplied cpu->cid array and replaces the in-place mapping; topo info is invalidated. A compat.bpf.h wrapper silently no-ops on kernels that lack the kfunc.
A new SCX_KF_ALLOW_INIT bit in the kfunc context filter restricts the kfunc to ops.init() at verifier load time.
Signed-off-by Tejun Heo <[email protected]>
Reviewed-by Cheng-Yang Chou <[email protected]>
--- kernel/sched/ext.c | 16 +++-- kernel/sched/ext_cid.c | 75 +++++++++++++++++++++++- kernel/sched/ext_cid.h | 1 + tools/sched_ext/include/scx/compat.bpf.h | 12 ++++ 4 files changed, 97 insertions(+), 7 deletions(-)
kernel/sched/ext.c +10 -6
@@ -9641,10 +9641,11 @@ static const struct btf_kfunc_id_set scx_kfunc_set_any = {*/ enum scx_kf_allow_flags {SCX_KF_ALLOW_UNLOCKED =1 <<0 , -SCX_KF_ALLOW_CPU_RELEASE =1 <<1 , -SCX_KF_ALLOW_DISPATCH =1 <<2 , -SCX_KF_ALLOW_ENQUEUE =1 <<3 , -SCX_KF_ALLOW_SELECT_CPU =1 <<4 , +SCX_KF_ALLOW_INIT =1 <<1 , +SCX_KF_ALLOW_CPU_RELEASE =1 <<2 , +SCX_KF_ALLOW_DISPATCH =1 <<3 , +SCX_KF_ALLOW_ENQUEUE =1 <<4 , +SCX_KF_ALLOW_SELECT_CPU =1 <<5 , };/*
@@ -9672,7 +9673,7 @@ static const u32 scx_kf_allow_flags[] = { [SCX_OP_IDX(sub_detach)] = SCX_KF_ALLOW_UNLOCKED, [SCX_OP_IDX(cpu_online)] = SCX_KF_ALLOW_UNLOCKED, [SCX_OP_IDX(cpu_offline)] = SCX_KF_ALLOW_UNLOCKED, - [SCX_OP_IDX(init)] = SCX_KF_ALLOW_UNLOCKED, + [SCX_OP_IDX(init)] = SCX_KF_ALLOW_UNLOCKED | SCX_KF_ALLOW_INIT, [SCX_OP_IDX(exit)] = SCX_KF_ALLOW_UNLOCKED, };
@@ -9687,6 +9688,7 @@ static const u32 scx_kf_allow_flags[] = {int scx_kfunc_context_filter (const struct bpf_prog *prog,u32 kfunc_id) {bool in_unlocked =btf_id_set8_contains (&scx_kfunc_ids_unlocked, kfunc_id); +bool in_init =btf_id_set8_contains (&scx_kfunc_ids_init, kfunc_id);bool in_select_cpu =btf_id_set8_contains (&scx_kfunc_ids_select_cpu, kfunc_id);bool in_enqueue =btf_id_set8_contains (&scx_kfunc_ids_enqueue_dispatch, kfunc_id);bool in_dispatch =btf_id_set8_contains (&scx_kfunc_ids_dispatch, kfunc_id);
@@ -9696,7 +9698,7 @@ int scx_kfunc_context_filter(const struct bpf_prog *prog, u32 kfunc_id)u32 moff, flags;/* Not an SCX kfunc - allow. */ -if (!(in_unlocked || in_select_cpu || in_enqueue || in_dispatch || +if (!(in_unlocked || in_init || in_select_cpu || in_enqueue || in_dispatch || in_cpu_release || in_idle || in_any))return 0 ;
@@ -9732,6 +9734,8 @@ int scx_kfunc_context_filter(const struct bpf_prog *prog, u32 kfunc_id)if ((flags &SCX_KF_ALLOW_UNLOCKED ) && in_unlocked)return 0 ; +if ((flags &SCX_KF_ALLOW_INIT ) && in_init) +return 0 ;if ((flags &SCX_KF_ALLOW_CPU_RELEASE ) && in_cpu_release)return 0 ;if ((flags &SCX_KF_ALLOW_DISPATCH ) && in_dispatch)
kernel/sched/ext_cid.c +74 -1
93 lines not on this page · raw message
kernel/sched/ext_cid.h +1 -0
@@ -49,6 +49,7 @@ struct scx_sched;extern s16 *scx_cid_to_cpu_tbl;extern s16 *scx_cpu_to_cid_tbl;extern struct scx_cid_topo *scx_cid_topo; +extern struct btf_id_set8 scx_kfunc_ids_init;s32 scx_cid_init (struct scx_sched *sch);int scx_cid_kfunc_init (void );
tools/sched_ext/include/scx/compat.bpf.h +12 -0
@@ -121,6 +121,18 @@ static inline bool scx_bpf_sub_dispatch(u64 cgroup_id)return false; } +/* +* v7.2: scx_bpf_cid_override() for explicit cpu->cid mapping. Ignore if +* missing. +*/ +void scx_bpf_cid_override___compat(const s32 *cpu_to_cid, u32 cpu_to_cid__sz) __ksym __weak; + +static inline void scx_bpf_cid_override (const s32 *cpu_to_cid,u32 cpu_to_cid__sz) +{ +if (bpf_ksym_exists (scx_bpf_cid_override___compat)) +return scx_bpf_cid_override___compat (cpu_to_cid, cpu_to_cid__sz); +} +/** * __COMPAT_is_enq_cpu_selected - Test if SCX_ENQ_CPU_SELECTED is on * in a compatible way. We will preserve this __COMPAT helper until v6.16.
Signature · 1 line
2.53.0