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.

v4: Rebased over the exit_cpu plumbing. scx_exit() and scx_verror()
    are now macros wrapping raw_smp_processor_id(); move both macros
    plus the underlying __scx_exit() / scx_vexit() declarations to
    the header.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Cheng-Yang Chou <yphbchou0911@gmail.com>
Reviewed-by: Changwoo Min <changwoo@igalia.com>
Reviewed-by: Andrea Righi <arighi@nvidia.com>

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 0d0833bd8d20454c902445e3d5986e35a611e254..2f16dc2b814befb821166475ff21e6002b7f72e9 100644 (file)
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -231,13 +231,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, s32 exit_cpu, const char *fmt,
-                     va_list args);
 
-static __printf(5, 6) bool __scx_exit(struct scx_sched *sch,
-                                     enum scx_exit_kind kind, s64 exit_code,
-                                     s32 exit_cpu, const char *fmt, ...)
+__printf(5, 6) bool __scx_exit(struct scx_sched *sch,
+                              enum scx_exit_kind kind, s64 exit_code,
+                              s32 exit_cpu, const char *fmt, ...)
 {
        va_list args;
        bool ret;
@@ -249,13 +246,6 @@ static __printf(5, 6) bool __scx_exit(struct scx_sched *sch,
        return ret;
 }
 
-#define scx_exit(sch, kind, exit_code, fmt, args...)                           \
-       __scx_exit(sch, kind, exit_code, raw_smp_processor_id(), fmt, ##args)
-
-#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, raw_smp_processor_id(), 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)
@@ -6458,9 +6448,9 @@ 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,
-                     enum scx_exit_kind kind, s64 exit_code, s32 exit_cpu,
-                     const char *fmt, va_list args)
+bool scx_vexit(struct scx_sched *sch,
+              enum scx_exit_kind kind, s64 exit_code, s32 exit_cpu,
+              const char *fmt, va_list args)
 {
        struct scx_exit_info *ei = sch->exit_info;
 

diff --git a/kernel/sched/ext_internal.h b/kernel/sched/ext_internal.h
index d8fb0b0b652cb5ce2ed0fe4237296867866c1e15..0c55c5481fa513b133ce3e4eaf8e4c7c2cff4fc8 100644 (file)
--- a/kernel/sched/ext_internal.h
+++ b/kernel/sched/ext_internal.h
@@ -1360,6 +1360,18 @@ 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,
+              s32 exit_cpu, const char *fmt, va_list args);
+__printf(5, 6) bool __scx_exit(struct scx_sched *sch, enum scx_exit_kind kind,
+                              s64 exit_code, s32 exit_cpu, const char *fmt, ...);
+
+#define scx_exit(sch, kind, exit_code, fmt, args...)                           \
+       __scx_exit(sch, kind, exit_code, raw_smp_processor_id(), fmt, ##args)
+#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, raw_smp_processor_id(), fmt, args)
+
 /*
  * Return the rq currently locked from an scx callback, or NULL if no rq is
  * locked.