sched_ext: Move scx_exit(), scx_error() and friends to ext_internal.h
Subsystems (2)
Tejun Heo
reviewerPATCH 3/17 sched_ext: Move scx_exit(), scx_error() and friends to ext_internal.h
Things shared across multiple .c files belong in a header. scx_exit() / scx_error() (and their scx_vexit() / scx_verror() siblings) are already called from ext_idle.c and the upcoming ext_cid.c, and it was only build_policy.c's textual inclusion of ext.c that made the references resolve. Move the whole family to ext_internal.h.
Pure visibility change.
Signed-off-by Tejun Heo <[email protected]>
Reviewed-by Cheng-Yang Chou <[email protected]>
--- kernel/sched/ext.c | 13 ++++--------- kernel/sched/ext_internal.h | 8 ++++++++ 2 files changed, 12 insertions(+), 9 deletions(-)
kernel/sched/ext.c +4 -9
@@ -235,12 +235,10 @@ static void run_deferred(struct rq *rq);static bool task_dead_and_done (struct task_struct *p);static void scx_kick_cpu (struct scx_sched *sch,s32 cpu,u64 flags);static void scx_disable (struct scx_sched *sch,enum scx_exit_kind kind); -static bool scx_vexit (struct scx_sched *sch,enum scx_exit_kind kind, -s64 exit_code,const char *fmt,va_list args); -static __printf(4, 5) bool scx_exit(struct scx_sched *sch, - enum scx_exit_kind kind, s64 exit_code, - const char *fmt, ...) +__printf(4, 5) bool scx_exit(struct scx_sched *sch, +enum scx_exit_kind kind,s64 exit_code, +const char *fmt, ...) {va_list args;bool ret;
@@ -252,9 +250,6 @@ static __printf(4, 5) bool scx_exit(struct scx_sched *sch,return ret; } -#define scx_error(sch, fmt, args...) scx_exit((sch), SCX_EXIT_ERROR, 0, fmt, ##args) -#define scx_verror (sch, fmt, args) scx_vexit((sch), SCX_EXIT_ERROR, 0, fmt, args) -#define SCX_HAS_OP (sch, op) test_bit(SCX_OP_IDX(op), (sch)->has_op)static long jiffies_delta_msecs (unsigned long at,unsigned long now)
@@ -6350,7 +6345,7 @@ static void scx_disable_irq_workfn(struct irq_work *irq_work)kthread_queue_work (sch->helper, &sch->disable_work); } -static bool scx_vexit (struct scx_sched *sch, +bool scx_vexit (struct scx_sched *sch,enum scx_exit_kind kind,s64 exit_code,const char *fmt,va_list args) {
kernel/sched/ext_internal.h +8 -0
@@ -1352,6 +1352,14 @@ 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); +bool scx_vexit (struct scx_sched *sch,enum scx_exit_kind kind,s64 exit_code, +const char *fmt,va_list args); +__printf(4, 5) bool scx_exit(struct scx_sched *sch, enum scx_exit_kind kind, +s64 exit_code,const char *fmt, ...); + +#define scx_verror (sch, fmt, args) scx_vexit((sch), SCX_EXIT_ERROR, 0, fmt, args) +#define scx_error(sch, fmt, args...) scx_exit((sch), SCX_EXIT_ERROR, 0, fmt, ##args) +/* * Return the rq currently locked from an scx callback, or NULL if no rq is * locked.
Signature · 1 line
2.53.0