sched,preempt: Move preempt_dynamic to debug.c

Move the #ifdef SCHED_DEBUG bits to kernel/sched/debug.c in order to
collect all the debugfs bits.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20210412102001.353833279@infradead.org

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index bac30db29d3fc0a3428d8d8b6186345572fc3c7d..e6c714b9b2111164b658b817232bb208a7af68df 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5371,9 +5371,9 @@ enum {
        preempt_dynamic_full,
 };
 
-static int preempt_dynamic_mode = preempt_dynamic_full;
+int preempt_dynamic_mode = preempt_dynamic_full;
 
-static int sched_dynamic_mode(const char *str)
+int sched_dynamic_mode(const char *str)
 {
        if (!strcmp(str, "none"))
                return preempt_dynamic_none;
@@ -5387,7 +5387,7 @@ static int sched_dynamic_mode(const char *str)
        return -EINVAL;
 }
 
-static void sched_dynamic_update(int mode)
+void sched_dynamic_update(int mode)
 {
        /*
         * Avoid {NONE,VOLUNTARY} -> FULL transitions from ever ending up in
@@ -5444,79 +5444,8 @@ static int __init setup_preempt_mode(char *str)
 }
 __setup("preempt=", setup_preempt_mode);
 
-#ifdef CONFIG_SCHED_DEBUG
-
-static ssize_t sched_dynamic_write(struct file *filp, const char __user *ubuf,
-                                  size_t cnt, loff_t *ppos)
-{
-       char buf[16];
-       int mode;
-
-       if (cnt > 15)
-               cnt = 15;
-
-       if (copy_from_user(&buf, ubuf, cnt))
-               return -EFAULT;
-
-       buf[cnt] = 0;
-       mode = sched_dynamic_mode(strstrip(buf));
-       if (mode < 0)
-               return mode;
-
-       sched_dynamic_update(mode);
-
-       *ppos += cnt;
-
-       return cnt;
-}
-
-static int sched_dynamic_show(struct seq_file *m, void *v)
-{
-       static const char * preempt_modes[] = {
-               "none", "voluntary", "full"
-       };
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(preempt_modes); i++) {
-               if (preempt_dynamic_mode == i)
-                       seq_puts(m, "(");
-               seq_puts(m, preempt_modes[i]);
-               if (preempt_dynamic_mode == i)
-                       seq_puts(m, ")");
-
-               seq_puts(m, " ");
-       }
-
-       seq_puts(m, "\n");
-       return 0;
-}
-
-static int sched_dynamic_open(struct inode *inode, struct file *filp)
-{
-       return single_open(filp, sched_dynamic_show, NULL);
-}
-
-static const struct file_operations sched_dynamic_fops = {
-       .open           = sched_dynamic_open,
-       .write          = sched_dynamic_write,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-extern struct dentry *debugfs_sched;
-
-static __init int sched_init_debug_dynamic(void)
-{
-       debugfs_create_file("sched_preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops);
-       return 0;
-}
-late_initcall(sched_init_debug_dynamic);
-
-#endif /* CONFIG_SCHED_DEBUG */
 #endif /* CONFIG_PREEMPT_DYNAMIC */
 
-
 /*
  * This is the entry point to schedule() from kernel preemption
  * off of irq context.

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 2093b9086e349a557ad221ceb9800a016de20266..bdd344f92c410eff12fa9d991cf5c5b9a5890cfe 100644 (file)
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -213,9 +213,71 @@ static const struct file_operations sched_scaling_fops = {
 
 #endif /* SMP */
 
+#ifdef CONFIG_PREEMPT_DYNAMIC
+
+static ssize_t sched_dynamic_write(struct file *filp, const char __user *ubuf,
+                                  size_t cnt, loff_t *ppos)
+{
+       char buf[16];
+       int mode;
+
+       if (cnt > 15)
+               cnt = 15;
+
+       if (copy_from_user(&buf, ubuf, cnt))
+               return -EFAULT;
+
+       buf[cnt] = 0;
+       mode = sched_dynamic_mode(strstrip(buf));
+       if (mode < 0)
+               return mode;
+
+       sched_dynamic_update(mode);
+
+       *ppos += cnt;
+
+       return cnt;
+}
+
+static int sched_dynamic_show(struct seq_file *m, void *v)
+{
+       static const char * preempt_modes[] = {
+               "none", "voluntary", "full"
+       };
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(preempt_modes); i++) {
+               if (preempt_dynamic_mode == i)
+                       seq_puts(m, "(");
+               seq_puts(m, preempt_modes[i]);
+               if (preempt_dynamic_mode == i)
+                       seq_puts(m, ")");
+
+               seq_puts(m, " ");
+       }
+
+       seq_puts(m, "\n");
+       return 0;
+}
+
+static int sched_dynamic_open(struct inode *inode, struct file *filp)
+{
+       return single_open(filp, sched_dynamic_show, NULL);
+}
+
+static const struct file_operations sched_dynamic_fops = {
+       .open           = sched_dynamic_open,
+       .write          = sched_dynamic_write,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+#endif /* CONFIG_PREEMPT_DYNAMIC */
+
 __read_mostly bool sched_debug_enabled;
 
-struct dentry *debugfs_sched;
+static struct dentry *debugfs_sched;
 
 static __init int sched_init_debug(void)
 {
@@ -225,6 +287,9 @@ static __init int sched_init_debug(void)
 
        debugfs_create_file("features", 0644, debugfs_sched, NULL, &sched_feat_fops);
        debugfs_create_bool("debug_enabled", 0644, debugfs_sched, &sched_debug_enabled);
+#ifdef CONFIG_PREEMPT_DYNAMIC
+       debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops);
+#endif
 
        debugfs_create_u32("latency_ns", 0644, debugfs_sched, &sysctl_sched_latency);
        debugfs_create_u32("min_granularity_ns", 0644, debugfs_sched, &sysctl_sched_min_granularity);

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 123ff3bb90bc286890b77928074d72a8da86fb0a..c312389113ce312cd6ae5385917ad9b83d2947f1 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2734,5 +2734,12 @@ static inline bool is_per_cpu_kthread(struct task_struct *p)
 }
 #endif
 
-void swake_up_all_locked(struct swait_queue_head *q);
-void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
+extern void swake_up_all_locked(struct swait_queue_head *q);
+extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
+
+#ifdef CONFIG_PREEMPT_DYNAMIC
+extern int preempt_dynamic_mode;
+extern int sched_dynamic_mode(const char *str);
+extern void sched_dynamic_update(int mode);
+#endif
+