module: Move kdb module related code out of main kdb code

No functional change.

This patch migrates the kdb 'lsmod' command support out of main
kdb code into its own file under kernel/module. In addition to
the above, a minor style warning i.e. missing a blank line after
declarations, was resolved too. The new file was added to
MAINTAINERS. Finally we remove linux/module.h as it is entirely
redundant.

Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6dcd93fb3a962780f52e8e024858897b406e2618..87cc05c6b462f81ef883a934c87d31d83ef1e728 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10907,6 +10907,7 @@ F:      drivers/tty/serial/kgdboc.c
 F:     include/linux/kdb.h
 F:     include/linux/kgdb.h
 F:     kernel/debug/
+F:     kernel/module/kdb.c
 
 KHADAS MCU MFD DRIVER
 M:     Neil Armstrong <narmstrong@baylibre.com>

diff --git a/include/linux/kdb.h b/include/linux/kdb.h
index ea0f5e580fac24aa6fb1651223d8de80b1594809..07dfb6a20a1c4dd03752c42d406f2c9264f571e6 100644 (file)
--- a/include/linux/kdb.h
+++ b/include/linux/kdb.h
@@ -222,5 +222,6 @@ enum {
 
 extern int kdbgetintenv(const char *, int *);
 extern int kdb_set(int, const char **);
+int kdb_lsmod(int argc, const char **argv);
 
 #endif /* !_KDB_H */

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index 6735ac36b7187edb6d18c9786c0b376b90e35a57..67d3c48a15222212f4c8002887059d938d4ea042 100644 (file)
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -9,7 +9,6 @@
  * Copyright (c) 2009 Wind River Systems, Inc.  All Rights Reserved.
  */
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>

diff --git a/kernel/debug/kdb/kdb_keyboard.c b/kernel/debug/kdb/kdb_keyboard.c
index f877a0a0d7cf2f36692433d258f663c2c25595ee..f87c750d3eb3cc2d0876eba5a9f13fbc5b994e3f 100644 (file)
--- a/kernel/debug/kdb/kdb_keyboard.c
+++ b/kernel/debug/kdb/kdb_keyboard.c
@@ -11,7 +11,6 @@
 #include <linux/kdb.h>
 #include <linux/keyboard.h>
 #include <linux/ctype.h>
-#include <linux/module.h>
 #include <linux/io.h>
 
 /* Keyboard Controller Registers on normal PCs. */

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 0852a537dad4c083d651da7b80d3bbf48f181f61..f3a30cd5037ff0e28b6b3ca44a278be3c7b513f9 100644 (file)
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -26,7 +26,6 @@
 #include <linux/utsname.h>
 #include <linux/vmalloc.h>
 #include <linux/atomic.h>
-#include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -2004,54 +2003,6 @@ static int kdb_ef(int argc, const char **argv)
        return 0;
 }
 
-#if defined(CONFIG_MODULES)
-/*
- * kdb_lsmod - This function implements the 'lsmod' command.  Lists
- *     currently loaded kernel modules.
- *     Mostly taken from userland lsmod.
- */
-static int kdb_lsmod(int argc, const char **argv)
-{
-       struct module *mod;
-
-       if (argc != 0)
-               return KDB_ARGCOUNT;
-
-       kdb_printf("Module                  Size  modstruct     Used by\n");
-       list_for_each_entry(mod, kdb_modules, list) {
-               if (mod->state == MODULE_STATE_UNFORMED)
-                       continue;
-
-               kdb_printf("%-20s%8u  0x%px ", mod->name,
-                          mod->core_layout.size, (void *)mod);
-#ifdef CONFIG_MODULE_UNLOAD
-               kdb_printf("%4d ", module_refcount(mod));
-#endif
-               if (mod->state == MODULE_STATE_GOING)
-                       kdb_printf(" (Unloading)");
-               else if (mod->state == MODULE_STATE_COMING)
-                       kdb_printf(" (Loading)");
-               else
-                       kdb_printf(" (Live)");
-               kdb_printf(" 0x%px", mod->core_layout.base);
-
-#ifdef CONFIG_MODULE_UNLOAD
-               {
-                       struct module_use *use;
-                       kdb_printf(" [ ");
-                       list_for_each_entry(use, &mod->source_list,
-                                           source_list)
-                               kdb_printf("%s ", use->target->name);
-                       kdb_printf("]\n");
-               }
-#endif
-       }
-
-       return 0;
-}
-
-#endif /* CONFIG_MODULES */
-
 /*
  * kdb_env - This function implements the 'env' command.  Display the
  *     current environment variables.

diff --git a/kernel/debug/kdb/kdb_private.h b/kernel/debug/kdb/kdb_private.h
index 0d2f9feea0a46a067171a7c83ecff8bb2dc2878e..1f8c519a5f81c3fbde7be5fdde64a726546c9864 100644 (file)
--- a/kernel/debug/kdb/kdb_private.h
+++ b/kernel/debug/kdb/kdb_private.h
@@ -226,10 +226,6 @@ extern void kdb_kbd_cleanup_state(void);
 #define kdb_kbd_cleanup_state()
 #endif /* ! CONFIG_KDB_KEYBOARD */
 
-#ifdef CONFIG_MODULES
-extern struct list_head *kdb_modules;
-#endif /* CONFIG_MODULES */
-
 extern char kdb_prompt_str[];
 
 #define        KDB_WORD_SIZE   ((int)sizeof(unsigned long))

diff --git a/kernel/debug/kdb/kdb_support.c b/kernel/debug/kdb/kdb_support.c
index 85cb51c4a17e67e1edf70a1b91f3ed04742119ce..0a39497140bfb0b30acb6f458d31628053bc0dc3 100644 (file)
--- a/kernel/debug/kdb/kdb_support.c
+++ b/kernel/debug/kdb/kdb_support.c
@@ -17,7 +17,6 @@
 #include <linux/stddef.h>
 #include <linux/vmalloc.h>
 #include <linux/ptrace.h>
-#include <linux/module.h>
 #include <linux/highmem.h>
 #include <linux/hardirq.h>
 #include <linux/delay.h>

diff --git a/kernel/module/Makefile b/kernel/module/Makefile
index cf8dcdc6b55fdad147cb6aec5559f8f9bb2c8c3c..88f5cdcdb067bed670d7d445f4a521054d09b42c 100644 (file)
--- a/kernel/module/Makefile
+++ b/kernel/module/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_PROC_FS) += procfs.o
 obj-$(CONFIG_SYSFS) += sysfs.o
+obj-$(CONFIG_KGDB_KDB) += kdb.o

diff --git a/kernel/module/kdb.c b/kernel/module/kdb.c
new file mode 100644 (file)
index 0000000..a446c69
--- /dev/null
+++ b/kernel/module/kdb.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Module kdb support
+ *
+ * Copyright (C) 2010 Jason Wessel
+ */
+
+#include <linux/module.h>
+#include <linux/kdb.h>
+#include "internal.h"
+
+/*
+ * kdb_lsmod - This function implements the 'lsmod' command.  Lists
+ *     currently loaded kernel modules.
+ *     Mostly taken from userland lsmod.
+ */
+int kdb_lsmod(int argc, const char **argv)
+{
+       struct module *mod;
+
+       if (argc != 0)
+               return KDB_ARGCOUNT;
+
+       kdb_printf("Module                  Size  modstruct     Used by\n");
+       list_for_each_entry(mod, &modules, list) {
+               if (mod->state == MODULE_STATE_UNFORMED)
+                       continue;
+
+               kdb_printf("%-20s%8u  0x%px ", mod->name,
+                          mod->core_layout.size, (void *)mod);
+#ifdef CONFIG_MODULE_UNLOAD
+               kdb_printf("%4d ", module_refcount(mod));
+#endif
+               if (mod->state == MODULE_STATE_GOING)
+                       kdb_printf(" (Unloading)");
+               else if (mod->state == MODULE_STATE_COMING)
+                       kdb_printf(" (Loading)");
+               else
+                       kdb_printf(" (Live)");
+               kdb_printf(" 0x%px", mod->core_layout.base);
+
+#ifdef CONFIG_MODULE_UNLOAD
+               {
+                       struct module_use *use;
+
+                       kdb_printf(" [ ");
+                       list_for_each_entry(use, &mod->source_list,
+                                           source_list)
+                               kdb_printf("%s ", use->target->name);
+                       kdb_printf("]\n");
+               }
+#endif
+       }
+
+       return 0;
+}

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 0cd0590dd41170842864f369139c8fc9e56a368d..a2dc54726621af9a6d2ed689895166aa5dbd8ac5 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -108,10 +108,6 @@ static void mod_update_bounds(struct module *mod)
                __mod_update_bounds(mod->init_layout.base, mod->init_layout.size);
 }
 
-#ifdef CONFIG_KGDB_KDB
-struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
-#endif /* CONFIG_KGDB_KDB */
-
 static void module_assert_mutex_or_preempt(void)
 {
 #ifdef CONFIG_LOCKDEP