module: core code clean up
Subsystems (3)
v10 cover module: core code clean up
Hi Luis,
As per your suggestion [1], this is an attempt to refactor and split optional code out of core module support code into separate components. This version is based on Linus' commit 7993e65fdd0f ("Merge tag 'mtd/fixes-for-5.17-rc5' ofgit://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Changes since v9 [2]
- Updated MAINTAINERS to include kernel/module/livepatch.c and kernel/module/kdb.c, respectively
- Moved kdb module related code i.e. support for the 'lsmod', out of core/or main kdb code into its own file under kernel/module
- Ensured is_module_sig_enforced(), as a stub, is available when Kconfig CONFIG_MODULE_SIG is not enabled/or selected (Christophe Leroy)
Changes since v8 [3]
- Resolved the reported lockdep warnings in kernel/module/kallsyms.c (Petr Mladek)
Changes since v7 [4]
- Removed redundant ifdef CONFIG_MODULES and endif pairing from kernel/module/Makefile
Changes since v6 [5]
- Moved KCOV_INSTRUMENT_module.o out of kernel/Makefile into kernel/module/Makefile (Christophe Leroy)
- Moved kernel/module/signature.c back into kernel/ (Christophe Leroy)
- Fixed Oops in add_kallsyms() due to an invalid pointer assignment (Christophe Leroy)
Changes since v5 [6]:
- Updated MAINTAINERS to include the entire kernel/module/ directory (Christophe Leroy)
- Reintroduce commit a97ac8cb24a3 ("module: fix signature check failures when using in-kernel decompression") (Michal Suchánek)
- Refactored code to address some (i.e. --ignore=MULTIPLE_ASSIGNMENTS,ASSIGN_IN_IF was used) style violations e.g. "Alignment should match open parenthesis", reported by scripts/checkpatch.pl --strict (Christophe Leroy)
- Used PAGE_ALIGN() and PAGE_ALIGNED() instead (Christophe Leroy)
- Removed sig_enforce from include/linux/module.h as it is only used in kernel/module/signing.c (Christophe Leroy)
- Added static keyword for anything not used outside a source file (Christophe Leroy)
- Moved mod_sysfs_teardown() to kernel/module/sysfs.c (Christophe Leroy)
- Removed kdb_modules from kernel/debug/kdb/kdb_private.h (Christophe Leroy)
Changes since v4 [7]:
- Moved is_livepatch_module() and set_livepatch_module() to kernel/module/livepatch.c
- Addressed minor compiler warning concerning kernel/module/internal.h (0-day)
- Resolved style violations reported by scripts/checkpatch.pl
- Dropped patch 5 [8] so external patch [9] can be applied at a later date post merge into module-next (Christophe Leroy)
Changes since v3 [10]:
- Refactored both is_livepatch_module() and set_livepatch_module(), respectively, to use IS_ENABLED(CONFIG_LIVEPATCH) (Joe Perches)
- Addressed various compiler warnings e.g., no previous prototype (0-day)
Changes since v2 [11]:
- Moved module decompress support to a separate file
- Made check_modinfo_livepatch() generic (Petr Mladek)
- Removed filename from each newly created file (Luis Chamberlain)
- Addressed some (i.e. --ignore=ASSIGN_IN_IF,AVOID_BUG was used) minor scripts/checkpatch.pl concerns e.g., use strscpy over strlcpy and missing a blank line after declarations (Allen)
Changes since v1 [12]:
- Moved module version support code into a new file
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/all/[email protected]/
[4]: https://lore.kernel.org/lkml/[email protected]/
[5]: https://lore.kernel.org/lkml/[email protected]/
[6]: https://lore.kernel.org/lkml/[email protected]/
[7]: https://lore.kernel.org/lkml/[email protected]/
[8]: https://lore.kernel.org/lkml/[email protected]/
[9]: https://lore.kernel.org/lkml/203348805c9ac9851d8939d15cb9802ef047b5e2.1643919758.git.christophe.leroy@csgroup.eu/
[10]: https://lore.kernel.org/lkml/[email protected]/
[11]: https://lore.kernel.org/lkml/[email protected]/
[12]: https://lore.kernel.org/lkml/[email protected]/
Aaron Tomlin (14):
module: Move all into module/
module: Simple refactor in preparation for split
module: Make internal.h and decompress.c more compliant
module: Move livepatch support to a separate file
module: Move latched RB-tree support to a separate file
module: Move strict rwx support to a separate file
module: Move extra signature support out of core code
module: Move kmemleak support to a separate file
module: Move kallsyms support into a separate file
module: kallsyms: Fix suspicious rcu usage
module: Move procfs support into a separate file
module: Move sysfs support into a separate file
module: Move kdb module related code out of main kdb code
module: Move version support into a separate file
MAINTAINERS | 4 +-
include/linux/kdb.h | 1 +
include/linux/module.h | 21 +-
kernel/Makefile | 5 +-
kernel/debug/kdb/kdb_main.c | 49 -
kernel/module-internal.h | 50 -
kernel/module/Makefile | 21 +
kernel/module/debug_kmemleak.c | 30 +
.../decompress.c} | 5 +-
kernel/module/internal.h | 275 +++
kernel/module/kallsyms.c | 512 +++++
kernel/module/kdb.c | 55 +
kernel/module/livepatch.c | 74 +
kernel/{module.c => module/main.c} | 1856 +----------------
kernel/module/procfs.c | 142 ++
kernel/module/signing.c | 122 ++
kernel/module/strict_rwx.c | 85 +
kernel/module/sysfs.c | 436 ++++
kernel/module/tree_lookup.c | 109 +
kernel/module/version.c | 109 +
kernel/module_signing.c | 45 -
21 files changed, 2074 insertions(+), 1932 deletions(-)
delete mode 100644 kernel/module-internal.h
create mode 100644 kernel/module/Makefile
create mode 100644 kernel/module/debug_kmemleak.c
rename kernel/{module_decompress.c => module/decompress.c} (99%)
create mode 100644 kernel/module/internal.h
create mode 100644 kernel/module/kallsyms.c
create mode 100644 kernel/module/kdb.c
create mode 100644 kernel/module/livepatch.c
rename kernel/{module.c => module/main.c} (64%)
create mode 100644 kernel/module/procfs.c
create mode 100644 kernel/module/signing.c
create mode 100644 kernel/module/strict_rwx.c
create mode 100644 kernel/module/sysfs.c
create mode 100644 kernel/module/tree_lookup.c
create mode 100644 kernel/module/version.c
delete mode 100644 kernel/module_signing.cbase-commit: 7993e65fdd0fe07beb9f36f998f9bbef2c0ee391
Signature · 1 line
2.34.1
PATCH v10 1/14 module: Move all into module/
No functional changes.
This patch moves all module related code into a separate directory, modifies each file name and creates a new Makefile. Note: this effort is in preparation to refactor core module code.
---
MAINTAINERS | 2 +-
kernel/Makefile | 5 +----
kernel/module/Makefile | 12 ++++++++++++
kernel/{module_decompress.c => module/decompress.c} | 2 +-
kernel/{module-internal.h => module/internal.h} | 0
kernel/{module.c => module/main.c} | 2 +-
kernel/{module_signing.c => module/signing.c} | 2 +-
7 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 kernel/module/Makefile
rename kernel/{module_decompress.c => module/decompress.c} (99%)
rename kernel/{module-internal.h => module/internal.h} (100%)
rename kernel/{module.c => module/main.c} (99%)
rename kernel/{module_signing.c => module/signing.c} (97%)MAINTAINERS +1 -1
@@ -13012,7 +13012,7 @@ L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next F: include/linux/module.h -F: kernel/module.c +F: kernel/module/ MONOLITHIC POWER SYSTEM PMIC DRIVER M: Saravanan Sekar <[email protected]>
kernel/Makefile +1 -4
@@ -29,7 +29,6 @@ KCOV_INSTRUMENT_softirq.o := n KCSAN_SANITIZE_softirq.o = n # These are called from save_stack_trace() on slub debug path, # and produce insane amounts of uninteresting coverage. -KCOV_INSTRUMENT_module.o := n KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument.
@@ -53,6 +52,7 @@ obj-y += rcu/ obj-y += livepatch/ obj-y += dma/ obj-y += entry/ +obj-$(CONFIG_MODULES) += module/ obj-$(CONFIG_KCMP) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o
@@ -66,9 +66,6 @@ ifneq ($(CONFIG_SMP),y) obj-y += up.o endif obj-$(CONFIG_UID16) += uid16.o -obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_MODULE_DECOMPRESS) += module_decompress.o -obj-$(CONFIG_MODULE_SIG) += module_signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
kernel/module/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for linux kernel module support +# + +# These are called from save_stack_trace() on slub debug path, +# and produce insane amounts of uninteresting coverage. +KCOV_INSTRUMENT_module.o := n + +obj-y += main.o +obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o +obj-$(CONFIG_MODULE_SIG) += signing.o
kernel/module/decompress.c renamed from kernel/module_decompress.c +1 -1
@@ -12,7 +12,7 @@#include <linux/sysfs.h> #include <linux/vmalloc.h> -#include "module-internal.h" +#include "internal.h" static int module_extend_max_pages (struct load_info *info,unsigned int extent) {
kernel/module/internal.h renamed from kernel/module-internal.h +0 -0
kernel/module/main.c renamed from kernel/module.c +1 -1
@@ -58,7 +58,7 @@#include <linux/dynamic_debug.h> #include <linux/audit.h> #include <uapi/linux/module.h> -#include "module-internal.h" +#include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/module.h>
kernel/module/signing.c renamed from kernel/module_signing.c +1 -1
@@ -12,7 +12,7 @@#include <linux/string.h> #include <linux/verification.h> #include <crypto/public_key.h> -#include "module-internal.h" +#include "internal.h" /* * Verify the signature on a module.
Signature · 1 line
2.34.1
PATCH v10 2/14 module: Simple refactor in preparation for split
In reply to Aaron TomlinNo functional change.
This patch makes it possible to move non-essential code out of core module code.
--- kernel/module/internal.h | 21 +++++++++++++++++++++ kernel/module/main.c | 22 ++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-)
kernel/module/internal.h +21 -0
@@ -7,6 +7,27 @@#include <linux/elf.h> #include <asm/module.h> +#include <linux/mutex.h> + +#ifndef ARCH_SHF_SMALL +#define ARCH_SHF_SMALL 0 +#endif + +/* If this is set, the section belongs in the init part of the module */ +#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG - 1)) +/* Maximum number of characters written by module_flags() */ +#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) + +extern struct mutex module_mutex; +extern struct list_head modules; + +/* Provided by the linker */ +extern const struct kernel_symbol __start___ksymtab[]; +extern const struct kernel_symbol __stop___ksymtab[]; +extern const struct kernel_symbol __start___ksymtab_gpl[]; +extern const struct kernel_symbol __stop___ksymtab_gpl[]; +extern const s32 __start___kcrctab[]; +extern const s32 __start___kcrctab_gpl[];struct load_info {const char *name;
kernel/module/main.c +2 -20
@@ -63,10 +63,6 @@#define CREATE_TRACE_POINTS #include <trace/events/module.h> -#ifndef ARCH_SHF_SMALL -#define ARCH_SHF_SMALL 0 -#endif -/* * Modules' sections will be aligned on page boundaries * to ensure complete separation of code and data, but
@@ -78,9 +74,6 @@# define debug_align (X ) (X)#endif -/* If this is set, the section belongs in the init part of the module */ -#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) -/* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable),
@@ -88,8 +81,8 @@* 3) module_addr_min/module_addr_max. * (delete and add uses RCU list operations). */ -static DEFINE_MUTEX (module_mutex); -static LIST_HEAD (modules); +DEFINE_MUTEX (module_mutex); +LIST_HEAD (modules);/* Work queue for freeing init sections in success case */ static void do_free_init (struct work_struct *w);
@@ -408,14 +401,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,return (void *)info->sechdrs[sec].sh_addr; } -/* Provided by the linker */ -extern const struct kernel_symbol __start___ksymtab[]; -extern const struct kernel_symbol __stop___ksymtab[]; -extern const struct kernel_symbol __start___ksymtab_gpl[]; -extern const struct kernel_symbol __stop___ksymtab_gpl[]; -extern const s32 __start___kcrctab[]; -extern const s32 __start___kcrctab_gpl[]; -#ifndef CONFIG_MODVERSIONS #define symversion (base, idx) NULL#else
@@ -4542,9 +4527,6 @@ static void cfi_cleanup(struct module *mod)#endif } -/* Maximum number of characters written by module_flags() */ -#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) -/* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ static char *module_flags (struct module *mod,char *buf) {
Signature · 1 line
2.34.1
PATCH v10 3/14 module: Make internal.h and decompress.c more compliant
In reply to Aaron TomlinThis patch will address the following warning and style violations generated by ./scripts/checkpatch.pl in strict mode:
WARNING: Use #include <linux/module.h> instead of <asm/module.h> #10: FILE: kernel/module/internal.h:10:
+#include <asm/module.h>
CHECK: spaces preferred around that '-' (ctx:VxV) #18: FILE: kernel/module/internal.h:18:
+#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
CHECK: Please use a blank line after function/struct/union/enum declarations #69: FILE: kernel/module/internal.h:69:
+}
+static inline void module_decompress_cleanup(struct load_info *info)
^
CHECK: extern prototypes should be avoided in .h files #84: FILE: kernel/module/internal.h:84:
+extern int mod_verify_sig(const void *mod, struct load_info *info);
WARNING: Missing a blank line after declarations #116: FILE: kernel/module/decompress.c:116:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
WARNING: Missing a blank line after declarations #174: FILE: kernel/module/decompress.c:174:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
CHECK: Please use a blank line after function/struct/union/enum declarations #258: FILE: kernel/module/decompress.c:258:
+}
+static struct kobj_attribute module_compression_attr = __ATTR_RO(compression);
Note: Fortunately, the multiple-include optimisation found in include/linux/module.h will prevent duplication/or inclusion more than once.
--- kernel/module/decompress.c | 3 +++ kernel/module/internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
kernel/module/decompress.c +3 -0
@@ -113,6 +113,7 @@ static ssize_t module_gzip_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out_inflate_end;
@@ -171,6 +172,7 @@ static ssize_t module_xz_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out;
@@ -256,6 +258,7 @@ static ssize_t compression_show(struct kobject *kobj, {return sysfs_emit (buf,"%s\n" ,__stringify (MODULE_COMPRESSION )); } +static struct kobj_attribute module_compression_attr =__ATTR_RO (compression);static int __init module_decompress_sysfs_init (void )
kernel/module/internal.h +4 -2
@@ -6,7 +6,8 @@*/ #include <linux/elf.h> -#include <asm/module.h> +#include <linux/compiler.h> +#include <linux/module.h> #include <linux/mutex.h> #ifndef ARCH_SHF_SMALL
@@ -54,7 +55,7 @@ struct load_info { } index; }; -extern int mod_verify_sig (const void *mod,struct load_info *info); +int mod_verify_sig (const void *mod,struct load_info *info);#ifdef CONFIG_MODULE_DECOMPRESS int module_decompress (struct load_info *info,const void *buf,size_t size);
@@ -65,6 +66,7 @@ static inline int module_decompress(struct load_info *info, {return -EOPNOTSUPP ; } +static inline void module_decompress_cleanup (struct load_info *info) { }
Signature · 1 line
2.34.1
PATCH v10 4/14 module: Move livepatch support to a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates livepatch support (i.e. used during module add/or load and remove/or deletion) from core module code into kernel/module/livepatch.c. At the moment it contains code to persist Elf information about a given livepatch module, only. The new file was added to MAINTAINERS.
--- MAINTAINERS | 1 + include/linux/module.h | 9 ++-- kernel/module/Makefile | 1 + kernel/module/internal.h | 22 ++++++++ kernel/module/livepatch.c | 74 +++++++++++++++++++++++++++ kernel/module/main.c | 102 ++++---------------------------------- 6 files changed, 111 insertions(+), 98 deletions(-) create mode 100644 kernel/module/livepatch.c
MAINTAINERS +1 -0
@@ -11149,6 +11149,7 @@ F: arch/s390/include/asm/livepatch.h F: arch/x86/include/asm/livepatch.h F: include/linux/livepatch.h F: kernel/livepatch/ +F: kernel/module/livepatch.c F: lib/livepatch/ F: samples/livepatch/ F: tools/testing/selftests/livepatch/
include/linux/module.h +3 -6
@@ -663,17 +663,14 @@ static inline bool module_requested_async_probing(struct module *module)return module && module->async_probe_requested; } -#ifdef CONFIG_LIVEPATCH static inline bool is_livepatch_module (struct module *mod) { +#ifdef CONFIG_LIVEPATCH return mod->klp; -} -#else /* !CONFIG_LIVEPATCH */ -static inline bool is_livepatch_module (struct module *mod) -{ +#else return false; +#endif } -#endif /* CONFIG_LIVEPATCH */ bool is_module_sig_enforced (void );void set_module_sig_enforced (void );
kernel/module/Makefile +1 -0
@@ -10,3 +10,4 @@ KCOV_INSTRUMENT_module.o := n obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o
kernel/module/internal.h +22 -0
@@ -57,6 +57,28 @@ struct load_info {int mod_verify_sig (const void *mod,struct load_info *info); +#ifdef CONFIG_LIVEPATCH +int copy_module_elf (struct module *mod,struct load_info *info); +void free_module_elf (struct module *mod); +#else /* !CONFIG_LIVEPATCH */ +static inline int copy_module_elf (struct module *mod,struct load_info *info) +{ +return 0 ; +} + +static inline void free_module_elf (struct module *mod) { } +#endif /* CONFIG_LIVEPATCH */ + +static inline bool set_livepatch_module (struct module *mod) +{ +#ifdef CONFIG_LIVEPATCH + mod->klp = true; +return true; +#else +return false; +#endif +} +#ifdef CONFIG_MODULE_DECOMPRESS int module_decompress (struct load_info *info,const void *buf,size_t size);void module_decompress_cleanup (struct load_info *info);
kernel/module/livepatch.c new file +74 -0
74 lines not on this page · raw message
kernel/module/main.c +10 -92
121 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 5/14 module: Move latched RB-tree support to a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates module latched RB-tree support (e.g. see __module_address()) from core module code into kernel/module/tree_lookup.c.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 33 +++++++++ kernel/module/main.c | 130 ++---------------------------------- kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 126 deletions(-) create mode 100644 kernel/module/tree_lookup.c
kernel/module/Makefile +1 -0
@@ -11,3 +11,4 @@ obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o +obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
kernel/module/internal.h +33 -0
@@ -9,6 +9,7 @@#include <linux/compiler.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/rculist.h> #ifndef ARCH_SHF_SMALL #define ARCH_SHF_SMALL 0
@@ -93,3 +94,35 @@ static inline void module_decompress_cleanup(struct load_info *info) { }#endif + +#ifdef CONFIG_MODULES_TREE_LOOKUP +struct mod_tree_root { +struct latch_tree_root root; +unsigned long addr_min; +unsigned long addr_max; +}; + +extern struct mod_tree_root mod_tree; + +void mod_tree_insert (struct module *mod); +void mod_tree_remove_init (struct module *mod); +void mod_tree_remove (struct module *mod); +struct module *mod_find (unsigned long addr); +#else /* !CONFIG_MODULES_TREE_LOOKUP */ + +static inline void mod_tree_insert (struct module *mod) { } +static inline void mod_tree_remove_init (struct module *mod) { } +static inline void mod_tree_remove (struct module *mod) { } +static inline struct module *mod_find (unsigned long addr) +{ +struct module *mod; + +list_for_each_entry_rcu (mod, &modules, list, +lockdep_is_held (&module_mutex)) { +if (within_module (addr, mod)) +return mod; + } + +return NULL ; +} +#endif /* CONFIG_MODULES_TREE_LOOKUP */
kernel/module/main.c +4 -126
142 lines not on this page · raw message
kernel/module/tree_lookup.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 6/14 module: Move strict rwx support to a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates code that makes module text
and rodata memory read-only and non-text memory
non-executable from core module code intokernel/module/strict_rwx.c.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 32 ++++++++++++ kernel/module/main.c | 99 +------------------------------------- kernel/module/strict_rwx.c | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 97 deletions(-) create mode 100644 kernel/module/strict_rwx.c
kernel/module/Makefile +1 -0
@@ -12,3 +12,4 @@ obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o +obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
kernel/module/internal.h +32 -0
@@ -20,6 +20,17 @@/* Maximum number of characters written by module_flags() */ #define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) +/* +* Modules' sections will be aligned on page boundaries +* to ensure complete separation of code and data, but +* only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +*/ +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +# define debug_align (X ) PAGE_ALIGN(X) +#else +# define debug_align (X ) (X) +#endif +extern struct mutex module_mutex;extern struct list_head modules;
@@ -126,3 +137,24 @@ static inline struct module *mod_find(unsigned long addr)return NULL ; }#endif /* CONFIG_MODULES_TREE_LOOKUP */ + +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +void frob_text (const struct module_layout *layout,int (*set_memory)(unsigned long start, +int num_pages)); +#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ + +#ifdef CONFIG_STRICT_MODULE_RWX +void module_enable_ro (const struct module *mod,bool after_init); +void module_enable_nx (const struct module *mod); +int module_enforce_rwx_sections (Elf_Ehdr *hdr,Elf_Shdr *sechdrs, +char *secstrings,struct module *mod); + +#else /* !CONFIG_STRICT_MODULE_RWX */ +static inline void module_enable_nx (const struct module *mod) { } +static inline void module_enable_ro (const struct module *mod,bool after_init) {} +static inline int module_enforce_rwx_sections (Elf_Ehdr *hdr,Elf_Shdr *sechdrs, +char *secstrings,struct module *mod) +{ +return 0 ; +} +#endif /* CONFIG_STRICT_MODULE_RWX */
kernel/module/main.c +2 -97
117 lines not on this page · raw message
kernel/module/strict_rwx.c new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 7/14 module: Move extra signature support out of core code
In reply to Aaron TomlinNo functional change.
This patch migrates additional module signature check code from core module code into kernel/module/signing.c.
--- include/linux/module.h | 12 +++--- kernel/module/internal.h | 9 +++++ kernel/module/main.c | 87 ---------------------------------------- kernel/module/signing.c | 77 +++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 92 deletions(-)
include/linux/module.h +7 -5
@@ -672,7 +672,6 @@ static inline bool is_livepatch_module(struct module *mod)#endif } -bool is_module_sig_enforced (void );void set_module_sig_enforced (void );#else /* !CONFIG_MODULES... */
@@ -799,10 +798,6 @@ static inline bool module_requested_async_probing(struct module *module)return false; } -static inline bool is_module_sig_enforced (void ) -{ -return false; -}static inline void set_module_sig_enforced (void ) {
@@ -854,11 +849,18 @@ static inline bool retpoline_module_ok(bool has_retpoline)#endif #ifdef CONFIG_MODULE_SIG +bool is_module_sig_enforced (void ); +static inline bool module_sig_ok (struct module *module) {return module->sig_ok; }#else /* !CONFIG_MODULE_SIG */ +static inline bool is_module_sig_enforced (void ) +{ +return false; +} +static inline bool module_sig_ok (struct module *module) {return true;
kernel/module/internal.h +9 -0
@@ -158,3 +158,12 @@ static inline int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, return 0; }#endif /* CONFIG_STRICT_MODULE_RWX */ + +#ifdef CONFIG_MODULE_SIG +int module_sig_check (struct load_info *info,int flags); +#else /* !CONFIG_MODULE_SIG */ +static inline int module_sig_check (struct load_info *info,int flags) +{ +return 0 ; +} +#endif /* !CONFIG_MODULE_SIG */
kernel/module/main.c +0 -87
105 lines not on this page · raw message
kernel/module/signing.c +77 -0
89 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 8/14 module: Move kmemleak support to a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates kmemleak code out of core module code into kernel/module/debug_kmemleak.c
--- kernel/module/Makefile | 1 + kernel/module/debug_kmemleak.c | 30 ++++++++++++++++++++++++++++++ kernel/module/internal.h | 7 +++++++ kernel/module/main.c | 27 --------------------------- 4 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 kernel/module/debug_kmemleak.c
kernel/module/Makefile +1 -0
@@ -13,3 +13,4 @@ obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o +obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o
kernel/module/debug_kmemleak.c new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Module kmemleak support +* +* Copyright (C) 2009 Catalin Marinas +*/ + +#include <linux/module.h> +#include <linux/kmemleak.h> +#include "internal.h" + +void kmemleak_load_module (const struct module *mod, +const struct load_info *info) +{ +unsigned int i; + +/* only scan the sections containing data */ +kmemleak_scan_area (mod,sizeof (struct module ),GFP_KERNEL ); + +for (i =1 ; i < info->hdr->e_shnum; i++) { +/* Scan all writable sections that's not executable */ +if (!(info->sechdrs[i].sh_flags &SHF_ALLOC ) || + !(info->sechdrs[i].sh_flags &SHF_WRITE ) || + (info->sechdrs[i].sh_flags &SHF_EXECINSTR )) +continue ; + +kmemleak_scan_area ((void *)info->sechdrs[i].sh_addr, + info->sechdrs[i].sh_size,GFP_KERNEL ); + } +}
kernel/module/internal.h +7 -0
@@ -167,3 +167,10 @@ static inline int module_sig_check(struct load_info *info, int flags) return 0; }#endif /* !CONFIG_MODULE_SIG */ + +#ifdef CONFIG_DEBUG_KMEMLEAK +void kmemleak_load_module (const struct module *mod,const struct load_info *info); +#else /* !CONFIG_DEBUG_KMEMLEAK */ +static inline void kmemleak_load_module (const struct module *mod, +const struct load_info *info) { } +#endif /* CONFIG_DEBUG_KMEMLEAK */
kernel/module/main.c +0 -27
@@ -2519,33 +2519,6 @@ bool __weak module_exit_section(const char *name)return strstarts (name,".exit" ); } -#ifdef CONFIG_DEBUG_KMEMLEAK -static void kmemleak_load_module (const struct module *mod, -const struct load_info *info) -{ -unsigned int i; - -/* only scan the sections containing data */ -kmemleak_scan_area (mod,sizeof (struct module ),GFP_KERNEL ); - -for (i =1 ; i < info->hdr->e_shnum; i++) { -/* Scan all writable sections that's not executable */ -if (!(info->sechdrs[i].sh_flags &SHF_ALLOC ) || - !(info->sechdrs[i].sh_flags &SHF_WRITE ) || - (info->sechdrs[i].sh_flags &SHF_EXECINSTR )) -continue ; - -kmemleak_scan_area ((void *)info->sechdrs[i].sh_addr, - info->sechdrs[i].sh_size,GFP_KERNEL ); - } -} -#else -static inline void kmemleak_load_module (const struct module *mod, -const struct load_info *info) -{ -} -#endif -static int validate_section_offset (struct load_info *info,Elf_Shdr *shdr) {#if defined(CONFIG_64BIT )
Signature · 1 line
2.34.1
PATCH v10 9/14 module: Move kallsyms support into a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 29 +++ kernel/module/kallsyms.c | 502 ++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 531 +-------------------------------------- 4 files changed, 538 insertions(+), 525 deletions(-) create mode 100644 kernel/module/kallsyms.c
kernel/module/Makefile +1 -0
@@ -14,3 +14,4 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o +obj-$(CONFIG_KALLSYMS) += kallsyms.o
kernel/module/internal.h +29 -0
@@ -68,6 +68,19 @@ struct load_info { };int mod_verify_sig (const void *mod,struct load_info *info); +struct module *find_module_all (const char *name,size_t len,bool even_unformed); +int cmp_name (const void *name,const void *sym); +long module_get_offset (struct module *mod,unsigned int *size,Elf_Shdr *sechdr, +unsigned int section); + +static inline unsigned long kernel_symbol_value (const struct kernel_symbol *sym) +{ +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS +return (unsigned long )offset_to_ptr (&sym->value_offset); +#else +return sym->value; +#endif +}#ifdef CONFIG_LIVEPATCH int copy_module_elf (struct module *mod,struct load_info *info);
@@ -174,3 +187,19 @@ void kmemleak_load_module(const struct module *mod, const struct load_info *infostatic inline void kmemleak_load_module (const struct module *mod,const struct load_info *info) { }#endif /* CONFIG_DEBUG_KMEMLEAK */ + +#ifdef CONFIG_KALLSYMS +void init_build_id (struct module *mod,const struct load_info *info); +void layout_symtab (struct module *mod,struct load_info *info); +void add_kallsyms (struct module *mod,const struct load_info *info); +unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name); + +static inline bool sect_empty (const Elf_Shdr *sect) +{ +return !(sect->sh_flags &SHF_ALLOC ) || sect->sh_size ==0 ; +} +#else /* !CONFIG_KALLSYMS */ +static inline void init_build_id (struct module *mod,const struct load_info *info) { } +static inline void layout_symtab (struct module *mod,struct load_info *info) { } +static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +#endif /* CONFIG_KALLSYMS */
kernel/module/kallsyms.c new file +502 -0
502 lines not on this page · raw message
kernel/module/main.c +6 -525
585 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 10/14 module: kallsyms: Fix suspicious rcu usage
In reply to Aaron TomlinNo functional change.
The purpose of this patch is to address the various Sparse warnings due to the incorrect dereference/or access of an __rcu pointer.
--- kernel/module/kallsyms.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
kernel/module/kallsyms.c +22 -12
@@ -171,14 +171,17 @@ void add_kallsyms(struct module *mod, const struct load_info *info)Elf_Shdr *symsec = &info->sechdrs[info->index.sym];/* Set up to point into init section. */ - mod->kallsyms = mod->init_layout.base + info->mod_kallsyms_init_off; + mod->kallsyms = (void __rcu *)mod->init_layout.base + + info->mod_kallsyms_init_off; +preempt_disable ();/* The following is safe since this pointer cannot change */ - mod->kallsyms->symtab = (void *)symsec->sh_addr; - mod->kallsyms->num_symtab = symsec->sh_size /sizeof (Elf_Sym); +rcu_dereference_sched (mod->kallsyms)->symtab = (void *)symsec->sh_addr; +rcu_dereference_sched (mod->kallsyms)->num_symtab = symsec->sh_size /sizeof (Elf_Sym);/* Make sure we get permanent strtab: don't use info->strtab. */ - mod->kallsyms->strtab = (void *)info->sechdrs[info->index.str].sh_addr; - mod->kallsyms->typetab = mod->init_layout.base + info->init_typeoffs; +rcu_dereference_sched (mod->kallsyms)->strtab = + (void *)info->sechdrs[info->index.str].sh_addr; +rcu_dereference_sched (mod->kallsyms)->typetab = mod->init_layout.base + info->init_typeoffs;/* * Now populate the cut down core kallsyms for after init
@@ -187,20 +190,22 @@ void add_kallsyms(struct module *mod, const struct load_info *info) mod->core_kallsyms.symtab = dst = mod->core_layout.base + info->symoffs; mod->core_kallsyms.strtab = s = mod->core_layout.base + info->stroffs; mod->core_kallsyms.typetab = mod->core_layout.base + info->core_typeoffs; - src = mod->kallsyms->symtab; -for (ndst = i =0 ; i < mod->kallsyms->num_symtab; i++) { - mod->kallsyms->typetab[i] =elf_type (src + i, info); + src =rcu_dereference_sched (mod->kallsyms)->symtab; +for (ndst = i =0 ; i <rcu_dereference_sched (mod->kallsyms)->num_symtab; i++) { +rcu_dereference_sched (mod->kallsyms)->typetab[i] =elf_type (src + i, info);if (i ==0 ||is_livepatch_module (mod) ||is_core_symbol (src + i, info->sechdrs, info->hdr->e_shnum, info->index.pcpu)) { mod->core_kallsyms.typetab[ndst] = - mod->kallsyms->typetab[i]; +rcu_dereference_sched (mod->kallsyms)->typetab[i]; dst[ndst] = src[i]; dst[ndst++].st_name = s - mod->core_kallsyms.strtab; - s +=strscpy (s, &mod->kallsyms->strtab[src[i].st_name], + s +=strscpy (s, + &rcu_dereference_sched (mod->kallsyms)->strtab[src[i].st_name],KSYM_NAME_LEN ) +1 ; } } +preempt_enable (); mod->core_kallsyms.num_symtab = ndst; }
@@ -478,11 +483,16 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,mutex_lock (&module_mutex);list_for_each_entry (mod, &modules, list) { -/* We hold module_mutex: no need for rcu_dereference_sched */ -struct mod_kallsyms *kallsyms = mod->kallsyms; +struct mod_kallsyms *kallsyms;if (mod->state ==MODULE_STATE_UNFORMED )continue ; + +/* Use rcu_dereference_sched() to remain compliant with the sparse tool */ +preempt_disable (); + kallsyms =rcu_dereference_sched (mod->kallsyms); +preempt_enable (); +for (i =0 ; i < kallsyms->num_symtab; i++) {const Elf_Sym *sym = &kallsyms->symtab[i];
Signature · 1 line
2.34.1
PATCH v10 11/14 module: Move procfs support into a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates code that allows one to generate a list of loaded/or linked modules via /proc when procfs support is enabled into kernel/module/procfs.c.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 1 + kernel/module/main.c | 131 +----------------------------------- kernel/module/procfs.c | 142 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 130 deletions(-) create mode 100644 kernel/module/procfs.c
kernel/module/Makefile +1 -0
@@ -15,3 +15,4 @@ obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o obj-$(CONFIG_KALLSYMS) += kallsyms.o +obj-$(CONFIG_PROC_FS) += procfs.o
kernel/module/internal.h +1 -0
@@ -72,6 +72,7 @@ struct module *find_module_all(const char *name, size_t len, bool even_unformed)int cmp_name (const void *name,const void *sym);long module_get_offset (struct module *mod,unsigned int *size,Elf_Shdr *sechdr,unsigned int section); +char *module_flags (struct module *mod,char *buf);static inline unsigned long kernel_symbol_value (const struct kernel_symbol *sym) {
kernel/module/main.c +1 -130
161 lines not on this page · raw message
kernel/module/procfs.c new file +142 -0
142 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 12/14 module: Move sysfs support into a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates module sysfs support out of core code into kernel/module/sysfs.c. In addition simple code refactoring to make this possible.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 21 ++ kernel/module/main.c | 469 +-------------------------------------- kernel/module/sysfs.c | 436 ++++++++++++++++++++++++++++++++++++ 4 files changed, 461 insertions(+), 466 deletions(-) create mode 100644 kernel/module/sysfs.c
kernel/module/Makefile +1 -0
@@ -16,3 +16,4 @@ obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PROC_FS) += procfs.o +obj-$(CONFIG_SYSFS) += sysfs.o
kernel/module/internal.h +21 -0
@@ -34,6 +34,9 @@extern struct mutex module_mutex;extern struct list_head modules; +extern struct module_attribute *modinfo_attrs[]; +extern size_t modinfo_attrs_count; +/* Provided by the linker */ extern const struct kernel_symbol __start___ksymtab[];extern const struct kernel_symbol __stop___ksymtab[];
@@ -204,3 +207,21 @@ static inline void init_build_id(struct module *mod, const struct load_info *infstatic inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { }#endif /* CONFIG_KALLSYMS */ + +#ifdef CONFIG_SYSFS +int mod_sysfs_setup (struct module *mod,const struct load_info *info, +struct kernel_param *kparam,unsigned int num_params); +void mod_sysfs_teardown (struct module *mod); +void init_param_lock (struct module *mod); +#else /* !CONFIG_SYSFS */ +static inline int mod_sysfs_setup (struct module *mod, +const struct load_info *info, +struct kernel_param *kparam, +unsigned int num_params) +{ +return 0 ; +} + +static inline void mod_sysfs_teardown (struct module *mod) { } +static inline void init_param_lock (struct module *mod) { } +#endif /* CONFIG_SYSFS */
kernel/module/main.c +3 -466
494 lines not on this page · raw message
kernel/module/sysfs.c new file +436 -0
436 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 13/14 module: Move kdb module related code out of main kdb code
In reply to Aaron TomlinNo 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.
--- MAINTAINERS | 1 + include/linux/kdb.h | 1 + kernel/debug/kdb/kdb_main.c | 49 --------------------------------- kernel/module/Makefile | 1 + kernel/module/kdb.c | 55 +++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 4 --- 6 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 kernel/module/kdb.c
MAINTAINERS +1 -0
@@ -10689,6 +10689,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 <[email protected]>
include/linux/kdb.h +1 -0
@@ -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 */
kernel/debug/kdb/kdb_main.c +0 -49
61 lines not on this page · raw message
kernel/module/Makefile +1 -0
@@ -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
kernel/module/kdb.c new file +55 -0
55 lines not on this page · raw message
kernel/module/main.c +0 -4
@@ -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
Signature · 1 line
2.34.1
Re: [PATCH v10 13/14] module: Move kdb module related code out of main kdb code
Le 07/03/2022 à 18:47, Aaron Tomlin a écrit :
Quoted 47 lines
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.Signed-off-by Aaron Tomlin <[email protected]>--- MAINTAINERS | 1 + include/linux/kdb.h | 1 + kernel/debug/kdb/kdb_main.c | 49 --------------------------------- kernel/module/Makefile | 1 + kernel/module/kdb.c | 55 +++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 4 --- 6 files changed, 58 insertions(+), 53 deletions(-)create mode 100644
kernel/module/kdb.cMAINTAINERS +1
-0@@ -10689,6 +10689,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 <[email protected]>include/linux/kdb.h +1
-0@@ -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 */ kernel/debug/kdb/kdb_main.c +0
-0
kernel/debug/kdb/kdb_main.c line 31
Quoted 7 lines
kernel/debug/kdb/kdb_main.c +0
-1@@ -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>
No need of linux/module.h here anymore ?
In that case, I see several other files in kernel/debug/kdb/ that include linux/module.h
Should it be removed in those files as well ?
Quoted 56 lines
kernel/module/Makefile +1
-0@@ -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.okernel/module/kdb.c new file +41
-0@@ -0,0 +1,55 @@ +// 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); +
kernel/module/kdb.c line 51
Quoted 10 lines
kernel/module/kdb.c new file +10
-0+#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
That's a ugly construct. Could it be a function instead that you call from this loop,
Something like:
static void lsmod_in_use(struct module *mod)
{
#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
}
Quoted 9 lines
kernel/module/kdb.c new file +4
-0+ } + +return 0 ; +}kernel/module/main.c +0
-0
kernel/module/main.c static void mod_update_bounds(struct module *mod) · line 112
Quoted 5 lines
kernel/module/main.c +0
-2@@ -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 */
It should be removed from kernel/debug/kdb/kdb_private.h as well.
Quoted 5 lines
kernel/module/main.c +0
-2-#endif /* CONFIG_KGDB_KDB */ -static void module_assert_mutex_or_preempt (void ) {#ifdef CONFIG_LOCKDEP
Re: [PATCH v10 13/14] module: Move kdb module related code out of main kdb code
Quoted 16 lines · Christophe Leroy
Le 07/03/2022 à 18:47, Aaron Tomlin a écrit :
kernel/debug/kdb/kdb_main.c line 31
Quoted 12 lines
kernel/debug/kdb/kdb_main.c +0
-1@@ -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> No need of
linux/module.hhere anymore ?
Hi Christophe,
Correct.
Quoted 4 lines
In that case, I see several other files in
kernel/debug/kdb/that includelinux/module.hShould it be removed in those files as well ?
I did not review the other kernel/debug/kdb/.*c files. Anyhow, yes it can be removed from each, since it is entirely redundant.
Quoted 52 lines
Quoted 52 lines
kernel/module/kdb.c new file +46
-0@@ -0,0 +1,55 @@ +// 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,
Quoted 8 lines
kernel/module/kdb.c line 51
Quoted 5 lines
kernel/module/kdb.c new file +5
-0+ source_list) + kdb_printf("%s ", use->target->name); + kdb_printf("]\n"); + } +#endif That's a ugly construct. Could it be a function instead that you call from this loop,
Fair enough and I agree; albeit, as you know, this was simply a migration to kernel/module/kdb.c. We could indeed address this format/or style concern later.
Quoted 8 lines
Quoted 8 lines
kernel/module/main.c +0
-0@@ -108,10 +108,6 @@ static void mod_update_bounds(struct module *mod)__mod_update_bounds (mod->init_layout.base, mod->init_layout.size); }
Quoted 4 lines
kernel/module/main.c static void mod_update_bounds(struct module *mod) · line 112
Quoted 2 lines
kernel/module/main.c +0
-2-#ifdef CONFIG_KGDB_KDB -struct list_head *kdb_modules = &modules;/* kdb needs the list of modules */ It should be removed from
kernel/debug/kdb/kdb_private.has well.
Agreed - this was missed.
Thanks,
Signature · 1 line
Aaron Tomlin
PATCH 1/1 kdb: Remove redundant module related references
In reply to Aaron TomlinHi Luis, Christoph, Daniel,
Is this patch ok or would you rather another iteration of the series? Either way is fine for me. Thanks.
No functional change.
There is no need to include linux/module.h.
This patch addresses the above. Furthermore, we remove the list of known loaded modules i.e. stored in 'kdb_modules', since it is now redundant.
--- kernel/debug/kdb/kdb_io.c | 1 - kernel/debug/kdb/kdb_keyboard.c | 1 - kernel/debug/kdb/kdb_private.h | 4 ---- kernel/debug/kdb/kdb_support.c | 1 - 4 files changed, 7 deletions(-)
kernel/debug/kdb/kdb_io.c +0 -1
@@ -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>
kernel/debug/kdb/kdb_keyboard.c +0 -1
@@ -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. */
kernel/debug/kdb/kdb_private.h +0 -4
@@ -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))
kernel/debug/kdb/kdb_support.c +0 -1
@@ -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>
Signature · 1 line
2.34.1
Re: [PATCH] kdb: Remove redundant module related references
Quoted 4 lines · Aaron Tomlin
Hi Luis, Christoph, Daniel,
Is this patch ok or would you rather another iteration of the series? Either way is fine for me. Thanks.
Another iteration makes more sense to me.
The removal of kdb_modules is semantically part of your module clean up patch set and should certainly be included in it.
The removal of the spurious #include's in other kdb files is a good change but it is fully independent of the module rework. AFAICT those fixes are good with or without your changes. This suggests these changes can be separate from the main patch set.
Daniel.
Quoted 71 lines
No functional change.
There is no need to include
linux/module.h.
This patch addresses the above. Furthermore, we remove the list of known loaded modules i.e. stored in 'kdb_modules', since it is now redundant.Fixes 260681b3763f ("module: Move kdb module related code out of main kdb code")Signed-off-by Aaron Tomlin <[email protected]>--- kernel/debug/kdb/kdb_io.c | 1 - kernel/debug/kdb/kdb_keyboard.c | 1 - kernel/debug/kdb/kdb_private.h | 4 ---- kernel/debug/kdb/kdb_support.c | 1 - 4 files changed, 7 deletions(-)kernel/debug/kdb/kdb_io.c +0
-1@@ -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> kernel/debug/kdb/kdb_keyboard.c +0
-1@@ -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. */ kernel/debug/kdb/kdb_private.h +0
-4@@ -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))kernel/debug/kdb/kdb_support.c +0
-1@@ -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> Signature · 1 line
2.34.1
Re: [PATCH] kdb: Remove redundant module related references
Quoted 2 lines · Daniel Thompson
On Tue, Mar 08, 2022 at 10:52:03AM +0000, Aaron Tomlin wrote:
Another iteration makes more sense to me.
Hi Daniel,
Thanks for your feedback.
Quoted 4 lines
The removal of the spurious #include's in other kdb files is a good change but it is fully independent of the module rework. AFAICT those fixes are good with or without your changes. This suggests these changes can be separate from the main patch set.
I will include these changes in the series too, as it cannot hurt.
Kind regards,
Signature · 1 line
Aaron Tomlin
Luis Chamberlain
maintainerRe: [PATCH] kdb: Remove redundant module related references
In reply to Daniel ThompsonQuoted 7 lines · Daniel Thompson
Quoted 4 lines · Aaron Tomlin
Hi Luis, Christoph, Daniel,
Is this patch ok or would you rather another iteration of the series? Either way is fine for me. Thanks.
Another iteration makes more sense to me.
Iteration yes, but separating the patches no into another series no.
Quoted 7 lines
The removal of
kdb_modulesis semantically part of your module clean up patch set and should certainly be included in it.The removal of the spurious #include's in other kdb files is a good change but it is fully independent of the module rework. AFAICT those fixes are good with or without your changes. This suggests these changes can be separate from the main patch set.
Small fixes get piled in first on the series. But this is not a fix. This effort will not be merged separately too. This won't go into the next merge window either, because:
1) There is no rush
2) It is too late as all this needs proper testing and its too late to claim enough testing
So given this is all related to the move I see no reason to treat this as a separate series. Your review of the v11 would be nice.
Luis
Re: [PATCH] kdb: Remove redundant module related references
Quoted 23 lines · Luis Chamberlain
Quoted 7 lines · Daniel Thompson
Quoted 4 lines · Aaron Tomlin
Hi Luis, Christoph, Daniel,
Is this patch ok or would you rather another iteration of the series? Either way is fine for me. Thanks.
Another iteration makes more sense to me.
Iteration yes, but separating the patches no into another series no.
Quoted 7 lines
The removal of
kdb_modulesis semantically part of your module clean up patch set and should certainly be included in it.The removal of the spurious #include's in other kdb files is a good change but it is fully independent of the module rework. AFAICT those fixes are good with or without your changes. This suggests these changes can be separate from the main patch set.
Small fixes get piled in first on the series. But this is not a fix. This effort will not be merged separately too. This won't go into the next merge window either, because:
Quoted 6 lines
1) There is no rush
2) It is too late as all this needs proper testing and its too late to claim enough testingSo given this is all related to the move I see no reason to treat this as a separate series. Your review of the v11 would be nice.
The reason to suggest separation was that the changes to the other files in kernel/debug/ are entirely independent of the module rework and would usually be landed via a different tree.
On the whole it doesn't really matter much... but landing the independent parts via the normal route for kgdb code reduces what I have to remember acking.
Daniel.
Re: [PATCH] kdb: Remove redundant module related references
Quoted 3 lines · Daniel Thompson
On the whole it doesn't really matter much... but landing the independent parts via the normal route for kgdb code reduces what I have to remember acking.
Hi Daniel,
Any thoughts on this [1]? Unfortunately, the wrong In-Reply-To was specified. So sorry about that. I will send another iteration of the series so that it'll be easier for Luis to apply to mcgrof/modules-testing or mcgrof/modules-next but after we have more feedback.
[1]: https://lore.kernel.org/lkml/[email protected]/
Kind regards,
Signature · 1 line
Aaron Tomlin
Re: [PATCH] kdb: Remove redundant module related references
Quoted 5 lines · Aaron Tomlin
Quoted 3 lines · Daniel Thompson
On the whole it doesn't really matter much... but landing the independent parts via the normal route for kgdb code reduces what I have to remember acking.
Quoted 8 lines
Hi Daniel,
Any thoughts on this [1]? Unfortunately, the wrong In-Reply-To was specified. So sorry about that. I will send another iteration of the series so that it'll be easier for Luis to apply to mcgrof/modules-testing or mcgrof/modules-next but after we have more feedback.
As above. I would rather not have to remember acking the header changes as well... but it's not like the sky is going to fall in.
Daniel.
PATCH v10 14/14 module: Move version support into a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates module version support out of core code into kernel/module/version.c. In addition simple code refactoring to make this possible.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 48 ++++++++++++ kernel/module/main.c | 156 ++------------------------------------- kernel/module/version.c | 109 +++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 148 deletions(-) create mode 100644 kernel/module/version.c
kernel/module/Makefile +1 -0
@@ -18,3 +18,4 @@ obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PROC_FS) += procfs.o obj-$(CONFIG_SYSFS) += sysfs.o obj-$(CONFIG_KGDB_KDB) += kdb.o +obj-$(CONFIG_MODVERSIONS) += version.o
kernel/module/internal.h +48 -0
58 lines not on this page · raw message
kernel/module/main.c +8 -148
189 lines not on this page · raw message
kernel/module/version.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.34.1
Luis Chamberlain
maintainerQuoted 7 lines · Aaron Tomlin
Hi Luis,
As per your suggestion [1], this is an attempt to refactor and split optional code out of core module support code into separate components. This version is based on Linus' commit
7993e65fdd0f("Merge tag 'mtd/fixes-for-5.17-rc5' ofgit://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Thanks! Pushed out to modules-testing to see what 0-day can find. Further review from others is welcomed in the meantime. If no issues are found, we also get kmod testing done, and more reviews, I can push then later to modules-next for further testing on linux-next.
Luis
Hi Luis,
Le 07/03/2022 à 22:05, Luis Chamberlain a écrit :
Quoted 9 lines · Aaron Tomlin
Quoted 7 lines
Hi Luis,
As per your suggestion [1], this is an attempt to refactor and split optional code out of core module support code into separate components. This version is based on Linus' commit
7993e65fdd0f("Merge tag 'mtd/fixes-for-5.17-rc5' ofgit://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Quoted 5 lines
Thanks! Pushed out to modules-testing to see what 0-day can find. Further review from others is welcomed in the meantime. If no issues are found, we also get kmod testing done, and more reviews, I can push then later to modules-next for further testing on linux-next.
As far as I understood kmod testing doesn't test the kernel at all so it won't test any of our changes.
In his mail last week, Lucas said: "kmod's testsuite don't test anything on the kernel side... the kernel part is mocked by the testsuite itself."
Christophe