sched_ext: Rename ops_cpu_valid() to scx_cpu_valid() and expose it
Subsystems (2)
Tejun Heo
reviewerPATCH 2/17 sched_ext: Rename ops_cpu_valid() to scx_cpu_valid() and expose it
Rename the static ext.c helper and declare it in ext_internal.h so ext_idle.c and the upcoming cid code can call it directly instead of relying on build_policy.c textual inclusion.
Pure rename and visibility change.
Signed-off-by Tejun Heo <[email protected]>
Reviewed-by Cheng-Yang Chou <[email protected]>
--- kernel/sched/ext.c | 22 +++++++++++----------- kernel/sched/ext_idle.c | 6 +++--- kernel/sched/ext_internal.h | 2 ++ 3 files changed, 16 insertions(+), 14 deletions(-)
kernel/sched/ext.c +11 -11
@@ -1055,7 +1055,7 @@ static inline bool __cpu_valid(s32 cpu) }/** -* ops_cpu_valid - Verify a cpu number, to be used on ops input args +* scx_cpu_valid - Verify a cpu number, to be used on ops input args * @sch: scx_sched to abort on error * @cpu: cpu number which came from a BPF ops * @where: extra information reported on error
@@ -1064,7 +1064,7 @@ static inline bool __cpu_valid(s32 cpu)* Verify that it is in range and one of the possible cpus. If invalid, trigger * an ops error. */ -static bool ops_cpu_valid (struct scx_sched *sch,s32 cpu,const char *where) +bool scx_cpu_valid (struct scx_sched *sch,s32 cpu,const char *where) {if (__cpu_valid (cpu)) {return true;
@@ -1677,7 +1677,7 @@ static struct scx_dispatch_q *find_dsq_for_dispatch(struct scx_sched *sch,if ((dsq_id &SCX_DSQ_LOCAL_ON ) ==SCX_DSQ_LOCAL_ON ) {s32 cpu = dsq_id &SCX_DSQ_LOCAL_CPU_MASK ; -if (!ops_cpu_valid (sch, cpu,"in SCX_DSQ_LOCAL_ON dispatch verdict" )) +if (!scx_cpu_valid (sch, cpu,"in SCX_DSQ_LOCAL_ON dispatch verdict" ))return find_global_dsq (sch, tcpu);return &cpu_rq (cpu)->scx.local_dsq;
@@ -3260,7 +3260,7 @@ static int select_task_rq_scx(struct task_struct *p, int prev_cpu, int wake_flagthis_rq ()->scx.in_select_cpu = false; p->scx.selected_cpu = cpu; *ddsp_taskp =NULL ; -if (ops_cpu_valid (sch, cpu,"from ops.select_cpu()" )) +if (scx_cpu_valid (sch, cpu,"from ops.select_cpu()" ))return cpu;else return prev_cpu;
@@ -8679,7 +8679,7 @@ static void scx_kick_cpu(struct scx_sched *sch, s32 cpu, u64 flags)struct rq *this_rq;unsigned long irq_flags; -if (!ops_cpu_valid (sch, cpu,NULL )) +if (!scx_cpu_valid (sch, cpu,NULL ))return ;local_irq_save (irq_flags);
@@ -8775,7 +8775,7 @@ __bpf_kfunc s32 scx_bpf_dsq_nr_queued(u64 dsq_id) }else if ((dsq_id &SCX_DSQ_LOCAL_ON ) ==SCX_DSQ_LOCAL_ON ) {s32 cpu = dsq_id &SCX_DSQ_LOCAL_CPU_MASK ; -if (ops_cpu_valid (sch, cpu,NULL )) { +if (scx_cpu_valid (sch, cpu,NULL )) { ret =READ_ONCE (cpu_rq (cpu)->scx.local_dsq.nr); goto out; }
@@ -9164,7 +9164,7 @@ __bpf_kfunc u32 scx_bpf_cpuperf_cap(s32 cpu, const struct bpf_prog_aux *aux)guard (rcu)(); sch =scx_prog_sched (aux); -if (likely (sch) &&ops_cpu_valid (sch, cpu,NULL )) +if (likely (sch) &&scx_cpu_valid (sch, cpu,NULL ))return arch_scale_cpu_capacity (cpu);else return SCX_CPUPERF_ONE ;
@@ -9192,7 +9192,7 @@ __bpf_kfunc u32 scx_bpf_cpuperf_cur(s32 cpu, const struct bpf_prog_aux *aux)guard (rcu)(); sch =scx_prog_sched (aux); -if (likely (sch) &&ops_cpu_valid (sch, cpu,NULL )) +if (likely (sch) &&scx_cpu_valid (sch, cpu,NULL ))return arch_scale_freq_capacity (cpu);else return SCX_CPUPERF_ONE ;
@@ -9228,7 +9228,7 @@ __bpf_kfunc void scx_bpf_cpuperf_set(s32 cpu, u32 perf, const struct bpf_prog_aureturn ; } -if (ops_cpu_valid (sch, cpu,NULL )) { +if (scx_cpu_valid (sch, cpu,NULL )) {struct rq *rq =cpu_rq (cpu), *locked_rq =scx_locked_rq ();struct rq_flags rf;
@@ -9341,7 +9341,7 @@ __bpf_kfunc struct rq *scx_bpf_cpu_rq(s32 cpu, const struct bpf_prog_aux *aux)if (unlikely (!sch))return NULL ; -if (!ops_cpu_valid (sch, cpu,NULL )) +if (!scx_cpu_valid (sch, cpu,NULL ))return NULL ;if (!sch->warned_deprecated_rq) {
@@ -9398,7 +9398,7 @@ __bpf_kfunc struct task_struct *scx_bpf_cpu_curr(s32 cpu, const struct bpf_prog_if (unlikely (!sch))return NULL ; -if (!ops_cpu_valid (sch, cpu,NULL )) +if (!scx_cpu_valid (sch, cpu,NULL ))return NULL ;return rcu_dereference (cpu_rq (cpu)->curr);
kernel/sched/ext_idle.c +3 -3
@@ -917,7 +917,7 @@ static s32 select_cpu_from_kfunc(struct scx_sched *sch, struct task_struct *p,bool we_locked = false;s32 cpu; -if (!ops_cpu_valid (sch, prev_cpu,NULL )) +if (!scx_cpu_valid (sch, prev_cpu,NULL ))return -EINVAL ;if (!check_builtin_idle_enabled (sch))
@@ -975,7 +975,7 @@ __bpf_kfunc s32 scx_bpf_cpu_node(s32 cpu, const struct bpf_prog_aux *aux)guard (rcu)(); sch =scx_prog_sched (aux); -if (unlikely (!sch) || !ops_cpu_valid (sch, cpu,NULL )) +if (unlikely (!sch) || !scx_cpu_valid (sch, cpu,NULL ))return NUMA_NO_NODE ;return cpu_to_node (cpu); }
@@ -1257,7 +1257,7 @@ __bpf_kfunc bool scx_bpf_test_and_clear_cpu_idle(s32 cpu, const struct bpf_prog_if (!check_builtin_idle_enabled (sch))return false; -if (!ops_cpu_valid (sch, cpu,NULL )) +if (!scx_cpu_valid (sch, cpu,NULL ))return false;return scx_idle_test_and_clear_cpu (cpu);
kernel/sched/ext_internal.h +2 -0
@@ -1350,6 +1350,8 @@ DECLARE_PER_CPU(struct rq *, scx_locked_rq_state);int scx_kfunc_context_filter (const struct bpf_prog *prog,u32 kfunc_id); +bool scx_cpu_valid (struct scx_sched *sch,s32 cpu,const char *where); +/* * Return the rq currently locked from an scx callback, or NULL if no rq is * locked.
Signature · 1 line
2.53.0