Skip to contentSkip to conversation

module: core code clean up

PATCH Superseded Aaron Tomlin 5 participants 34 messages Feb 18, 2022 – Feb 23, 2022 1 message not in the archive

Subsystems (2)

v6 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v6 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' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Please let me know your thoughts.

Changes since v5 [2]:

- 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 [3]:

- 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 [4] so external patch [5] can be applied at a later date post merge into module-next (Christophe Leroy)

Changes since v3 [6]:

- 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 [7]:

- 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 [8]:

- 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/lkml/[email protected]/
[4]: https://lore.kernel.org/lkml/[email protected]/
[5]: https://lore.kernel.org/lkml/203348805c9ac9851d8939d15cb9802ef047b5e2.1643919758.git.christophe.leroy@csgroup.eu/
[6]: https://lore.kernel.org/lkml/[email protected]/
[7]: https://lore.kernel.org/lkml/[email protected]/
[8]: https://lore.kernel.org/lkml/[email protected]/

Aaron Tomlin (13):
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: Move procfs support into a separate file
module: Move sysfs support into a separate file
module: Move kdb_modules list out of core code
module: Move version support into a separate file

 MAINTAINERS                                   |    2 +-
 include/linux/module.h                        |    9 +-
 kernel/Makefile                               |    5 +-
 kernel/debug/kdb/kdb_main.c                   |    5 +
 kernel/debug/kdb/kdb_private.h                |    4 -
 kernel/module-internal.h                      |   50 -
 kernel/module/Makefile                        |   19 +
 kernel/module/debug_kmemleak.c                |   30 +
 .../decompress.c}                             |    5 +-
 kernel/module/internal.h                      |  284 +++
 kernel/module/kallsyms.c                      |  502 +++++
 kernel/module/livepatch.c                     |   74 +
 kernel/{module.c => module/main.c}            | 1856 +----------------
 kernel/module/procfs.c                        |  142 ++
 .../signature.c}                              |    0
 kernel/module/signing.c                       |  122 ++
 kernel/module/strict_rwx.c                    |   84 +
 kernel/module/sysfs.c                         |  436 ++++
 kernel/module/tree_lookup.c                   |  109 +
 kernel/module/version.c                       |  109 +
 kernel/module_signing.c                       |   45 -
 21 files changed, 2010 insertions(+), 1882 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/livepatch.c
 rename kernel/{module.c => module/main.c} (64%)
 create mode 100644 kernel/module/procfs.c
 rename kernel/{module_signature.c => module/signature.c} (100%)
 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.c

base-commit: 7993e65fdd0fe07beb9f36f998f9bbef2c0ee391

Signature · 1 line
2.34.1
#1 lore raw

PATCH v6 1/13 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                              | 9 +++++++++
 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_signature.c => module/signature.c}   | 0
 kernel/{module_signing.c => module/signing.c}       | 2 +-
 8 files changed, 14 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_signature.c => module/signature.c} (100%)
 rename kernel/{module_signing.c => module/signing.c} (97%)
MAINTAINERS +1 -1
index bd86ed9fbc79..463bdb829db4 100644
@@ -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
index 56f4ee97f328..3a6380975c57 100644
@@ -53,6 +53,7 @@ obj-y += rcu/
 obj-y += livepatch/
 obj-y += dma/
 obj-y += entry/
+obj-y += module/
 
 obj-$(CONFIG_KCMP) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o
@@ -66,10 +67,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
 obj-$(CONFIG_CRASH_CORE) += crash_core.o
kernel/module/Makefile new file +9 -0
new file mode 100644
index 000000000000..2902fc7d0ef1
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for linux kernel module support
+#
+
+obj-$(CONFIG_MODULES) += main.o
+obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
+obj-$(CONFIG_MODULE_SIG) += signing.o
+obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
kernel/module/decompress.c renamed from kernel/module_decompress.c +1 -1
similarity index 99%
rename from kernel/module_decompress.c
rename to kernel/module/decompress.c
index ffef98a20320..d14d6443225a 100644
@@ -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
similarity index 100%
rename from kernel/module-internal.h
rename to kernel/module/internal.h
kernel/module/main.c renamed from kernel/module.c +1 -1
similarity index 99%
rename from kernel/module.c
rename to kernel/module/main.c
index 46a5c2ed1928..34a2b0cf3c3e 100644
@@ -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/signature.c renamed from kernel/module_signature.c +0 -0
similarity index 100%
rename from kernel/module_signature.c
rename to kernel/module/signature.c
kernel/module/signing.c renamed from kernel/module_signing.c +1 -1
similarity index 97%
rename from kernel/module_signing.c
rename to kernel/module/signing.c
index 8723ae70ea1f..8aeb6d2ee94b 100644
@@ -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
#2 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

Le 18/02/2022 à 22:24, Aaron Tomlin a écrit :

Quoted 17 lines

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                              | 9 +++++++++
  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_signature.c => module/signature.c}   | 0
  kernel/{module_signing.c => module/signing.c}       | 2 +-
  8 files changed, 14 insertions(+), 8 deletions(-)
Quoted 7 lines

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_signature.c => module/signature.c} (100%) rename kernel/{module_signing.c => module/signing.c} (97%)

I'm wondering whether we should avoid moving module_signature.c and leave it in kernel/ as this file is used even when CONFIG_MODULES is not selected, and he is the only one like this.

Keeping it outside of kernel/module/ would allow to conditionaly build entire kernel/module/ based of CONFIG_MODULES and then avoid all checks against CONFIG_MODULES which look misleading at times.

Christophe

#3 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

Quoted 28 lines · Christophe Leroy
Quoted 17 lines · Aaron Tomlin

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                              | 9 +++++++++
  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_signature.c => module/signature.c}   | 0
  kernel/{module_signing.c => module/signing.c}       | 2 +-
  8 files changed, 14 insertions(+), 8 deletions(-)
Quoted 7 lines

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_signature.c => module/signature.c} (100%) rename kernel/{module_signing.c => module/signing.c} (97%)

Quoted 7 lines

I'm wondering whether we should avoid moving module_signature.c and leave it in kernel/ as this file is used even when CONFIG_MODULES is not selected, and he is the only one like this.

Keeping it outside of kernel/module/ would allow to conditionaly build entire kernel/module/ based of CONFIG_MODULES and then avoid all checks against CONFIG_MODULES which look misleading at times.

Luis,

What is your opinion on this? Indeed, mod_check_sig() is used by code outside of kernel/module/ too i.e. ima_read_modsig(); albeit, I believe it does make sense to keep it under kernel/module/ since the function in question is used to review a given module's signature anyway.

Kind regards,

Signature · 1 line
Aaron Tomlin
maintainer
#4 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

Quoted 7 lines · Aaron Tomlin
Quoted 5 lines · Christophe Leroy
Quoted 1 line · Aaron Tomlin
  kernel/{module_signature.c => module/signature.c}   | 0

Keeping it outside of kernel/module/ would allow to conditionaly build entire kernel/module/ based of CONFIG_MODULES and then avoid all checks against CONFIG_MODULES which look misleading at times.

Quoted 6 lines

Luis,

What is your opinion on this? Indeed, mod_check_sig() is used by code outside of kernel/module/ too i.e. ima_read_modsig(); albeit, I believe it does make sense to keep it under kernel/module/ since the function in question is used to review a given module's signature anyway.

How about:

obj-$(CONFIG_MODULE_SIG_FORMAT) += module/module_signature.o

Luis

#6 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

In reply to Aaron Tomlin

Le 18/02/2022 à 22:24, Aaron Tomlin a écrit :

kernel/Makefile

Quoted 41 lines

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                              | 9 +++++++++
  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_signature.c => module/signature.c}   | 0
  kernel/{module_signing.c => module/signing.c}       | 2 +-
  8 files changed, 14 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_signature.c => module/signature.c} (100%) rename kernel/{module_signing.c => module/signing.c} (97%)

MAINTAINERS +1 -1
index bd86ed9fbc79..463bdb829db4 100644
@@ -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 +0 -0
index 56f4ee97f328..3a6380975c57 100644

This file also contains:

KCOV_INSTRUMENT_module.o := n

It needs to follow through into kernel/module/Makefile, with a copy of the comment. And then it needs to be taken care of while dismantling main.c

Quoted 34 lines
kernel/Makefile +1 -4
@@ -53,6 +53,7 @@ obj-y += rcu/
  obj-y += livepatch/
  obj-y += dma/
  obj-y += entry/
+obj-y += module/
 
  obj-$(CONFIG_KCMP) += kcmp.o
  obj-$(CONFIG_FREEZER) += freezer.o
@@ -66,10 +67,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
  obj-$(CONFIG_CRASH_CORE) += crash_core.o
kernel/module/Makefile new file +9 -0
new file mode 100644
index 000000000000..2902fc7d0ef1
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for linux kernel module support
+#
+
+obj-$(CONFIG_MODULES) += main.o
+obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
+obj-$(CONFIG_MODULE_SIG) += signing.o
+obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o

A message that is not in the archive (sent off-list or not yet received): CANfR36jccn4nHTSNOHbCz5mjaQ6r-uJONBt3taTgeX_XTEeWFw@mail.gmail.com

#8 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

Le 22/02/2022 à 12:13, Aaron Tomlin a écrit :

Quoted 8 lines · Christophe Leroy
Quoted 7 lines

kernel/Makefile

Quoted 4 lines
kernel/Makefile +0 -0
index 56f4ee97f328..3a6380975c57 100644

This file also contains:

Quoted 10 lines
Quoted 4 lines

KCOV_INSTRUMENT_module.o := n

It needs to follow through into kernel/module/Makefile, with a copy of the comment. And then it needs to be taken care of while dismantling main.c

Christophe,

I do not see why this is necessary.

I don't know.

The comment says:

# These are called from save_stack_trace() on slub debug path,

# and produce insane amounts of uninteresting coverage.

This was brought by commit 5c9a8750a640 ("kernel: add kcov code coverage")

Since then, some architectures don't have save_stack_trace() anymore as they were converted to generic ARCH_STACKWALK.
It was done on powerpc by commit a1cdef04f22d ("powerpc: Convert stacktrace to generic ARCH_STACKWALK")

Whatever you decide to do, you can't leave this in kernel/Makefile as module.o is gone.

Christophe

#9 lore raw

Re: [PATCH v6 01/13] module: Move all into module/

Quoted 9 lines · Christophe Leroy

I don't know.

The comment says:

# These are called from save_stack_trace() on slub debug path,

# and produce insane amounts of uninteresting coverage.

This was brought by commit 5c9a8750a640 ("kernel: add kcov code coverage")

Quoted 7 lines

Since then, some architectures don't have save_stack_trace() anymore as they were converted to generic ARCH_STACKWALK.
It was done on powerpc by commit a1cdef04f22d ("powerpc: Convert stacktrace to generic ARCH_STACKWALK")

Whatever you decide to do, you can't leave this in kernel/Makefile as module.o is gone.

Fair enough. I'll move it and copy the comment to kernel/module/Makefile.

Signature · 1 line
Aaron Tomlin
#10 lore raw

PATCH v6 2/13 module: Simple refactor in preparation for split

In reply to Aaron Tomlin

No 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
index 8c381c99062f..ea8c4c02614c 100644
@@ -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
index 34a2b0cf3c3e..5f5e21f972dd 100644
@@ -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
#11 lore raw

PATCH v6 3/13 module: Make internal.h and decompress.c more compliant

In reply to Aaron Tomlin

This 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.

Fixes f314dfea16a ("modsign: log module name in the event of an error")
---
 kernel/module/decompress.c | 3 +++
 kernel/module/internal.h   | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
kernel/module/decompress.c +3 -0
index d14d6443225a..2fc7081dd7c1 100644
@@ -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
index ea8c4c02614c..e0775e66bcf7 100644
@@ -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
#12 lore raw

PATCH v6 4/13 module: Move livepatch support to a separate file

In reply to Aaron Tomlin

No 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.

---
 include/linux/module.h    |   9 ++--
 kernel/module/Makefile    |   1 +
 kernel/module/internal.h  |  22 ++++++++
 kernel/module/livepatch.c |  74 +++++++++++++++++++++++++++
 kernel/module/main.c      | 102 ++++----------------------------------
 5 files changed, 110 insertions(+), 98 deletions(-)
 create mode 100644 kernel/module/livepatch.c
include/linux/module.h +3 -6
index 1e135fd5c076..7ec9715de7dc 100644
@@ -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
index 2902fc7d0ef1..ba3ebdb7055b 100644
@@ -7,3 +7,4 @@ obj-$(CONFIG_MODULES) += main.o
 obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
 obj-$(CONFIG_MODULE_SIG) += signing.o
 obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
+obj-$(CONFIG_LIVEPATCH) += livepatch.o
kernel/module/internal.h +22 -0
index e0775e66bcf7..ad7a444253ed 100644
@@ -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
#13 lore raw

PATCH v6 5/13 module: Move latched RB-tree support to a separate file

In reply to Aaron Tomlin

No 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      |   3 +
 kernel/module/internal.h    |  33 +++++++++
 kernel/module/main.c        | 130 ++----------------------------------
 kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++
 4 files changed, 149 insertions(+), 126 deletions(-)
 create mode 100644 kernel/module/tree_lookup.c
kernel/module/Makefile +3 -0
index ba3ebdb7055b..6fb21ebe1aa3 100644
@@ -8,3 +8,6 @@ obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
 obj-$(CONFIG_MODULE_SIG) += signing.o
 obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
 obj-$(CONFIG_LIVEPATCH) += livepatch.o
+ifdef CONFIG_MODULES
+obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
+endif
kernel/module/internal.h +33 -0
index ad7a444253ed..57a715454c9e 100644
@@ -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 void mod_tree_insert(struct module *mod) { }
+static void mod_tree_remove_init(struct module *mod) { }
+static 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
#14 lore raw

Re: [PATCH v6 05/13] module: Move latched RB-tree support to a separate file

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 6 lines

No 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.

Quoted 8 lines
---
  kernel/module/Makefile      |   3 +
  kernel/module/internal.h    |  33 +++++++++
  kernel/module/main.c        | 130 ++----------------------------------
  kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++
  4 files changed, 149 insertions(+), 126 deletions(-)

create mode 100644 kernel/module/tree_lookup.c

CC kernel/module/main.o
kernel/module/main.c:3723:6: warning: no previous prototype for 'module_layout' [-Wmissing-prototypes]
3723 | void module_layout(struct module *mod,

       |      ^~~~~~~~~~~~~

CC kernel/module/strict_rwx.o
In file included from kernel/module/strict_rwx.c:12:
kernel/module/internal.h:140:13: warning: 'mod_tree_remove' defined but not used [-Wunused-function]
140 | static void mod_tree_remove(struct module *mod) { }

       |             ^~~~~~~~~~~~~~~
kernel/module/internal.h:139:13: warning: 'mod_tree_remove_init' defined 
but not used [-Wunused-function]
   139 | static void mod_tree_remove_init(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~~~~~~
kernel/module/internal.h:138:13: warning: 'mod_tree_insert' defined but 
not used [-Wunused-function]
   138 | static void mod_tree_insert(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~

CC kernel/module/kallsyms.o
In file included from kernel/module/kallsyms.c:12:
kernel/module/internal.h:140:13: warning: 'mod_tree_remove' defined but not used [-Wunused-function]
140 | static void mod_tree_remove(struct module *mod) { }

       |             ^~~~~~~~~~~~~~~
kernel/module/internal.h:139:13: warning: 'mod_tree_remove_init' defined 
but not used [-Wunused-function]
   139 | static void mod_tree_remove_init(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~~~~~~
kernel/module/internal.h:138:13: warning: 'mod_tree_insert' defined but 
not used [-Wunused-function]
   138 | static void mod_tree_insert(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~

CC kernel/module/procfs.o
In file included from kernel/module/procfs.c:13:
kernel/module/internal.h:140:13: warning: 'mod_tree_remove' defined but not used [-Wunused-function]
140 | static void mod_tree_remove(struct module *mod) { }

       |             ^~~~~~~~~~~~~~~
kernel/module/internal.h:139:13: warning: 'mod_tree_remove_init' defined 
but not used [-Wunused-function]
   139 | static void mod_tree_remove_init(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~~~~~~
kernel/module/internal.h:138:13: warning: 'mod_tree_insert' defined but 
not used [-Wunused-function]
   138 | static void mod_tree_insert(struct module *mod) { }
       |             ^~~~~~~~~~~~~~~

Christophe

#15 lore raw

PATCH v6 6/13 module: Move strict rwx support to a separate file

In reply to Aaron Tomlin

No 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 into
kernel/module/strict_rwx.c.

---
 kernel/module/Makefile     |  1 +
 kernel/module/internal.h   | 38 +++++++++++++++
 kernel/module/main.c       | 99 +-------------------------------------
 kernel/module/strict_rwx.c | 84 ++++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+), 97 deletions(-)
 create mode 100644 kernel/module/strict_rwx.c
kernel/module/Makefile +1 -0
index 6fb21ebe1aa3..3f48343636ff 100644
@@ -10,4 +10,5 @@ obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
 obj-$(CONFIG_LIVEPATCH) += livepatch.o
 ifdef CONFIG_MODULES
 obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
+obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
 endif
kernel/module/internal.h +38 -0
index 57a715454c9e..f4b7e123d625 100644
@@ -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,30 @@ 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 frob_rodata(const struct module_layout *layout,
+		 int (*set_memory)(unsigned long start, int num_pages));
+void frob_ro_after_init(const struct module_layout *layout,
+			int (*set_memory)(unsigned long start, int num_pages));
+void frob_writable_data(const struct module_layout *layout,
+			int (*set_memory)(unsigned long start, int num_pages));
+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 void module_enable_nx(const struct module *mod) { }
+static void module_enable_ro(const struct module *mod, bool after_init) {}
+static 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 +84 -0

84 lines not on this page · raw message

Signature · 1 line
2.34.1
#16 lore raw

Re: [PATCH v6 06/13] module: Move strict rwx support to a separate file

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 7 lines

No 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 into
kernel/module/strict_rwx.c.

Quoted 8 lines
---
  kernel/module/Makefile     |  1 +
  kernel/module/internal.h   | 38 +++++++++++++++
  kernel/module/main.c       | 99 +-------------------------------------
  kernel/module/strict_rwx.c | 84 ++++++++++++++++++++++++++++++++
  4 files changed, 125 insertions(+), 97 deletions(-)

create mode 100644 kernel/module/strict_rwx.c

CC kernel/module/strict_rwx.o
In file included from ./include/linux/build_bug.h:5,

                  from ./include/linux/container_of.h:5,
                  from ./include/linux/list.h:5,
                  from ./include/linux/module.h:12,
                  from kernel/module/strict_rwx.c:8:

kernel/module/strict_rwx.c: In function 'frob_rodata':
kernel/module/strict_rwx.c:16:17: error: implicit declaration of function 'PAGE_ALIGNED'; did you mean 'IS_ALIGNED'? [-Werror=implicit-function-declaration]

    16 |         BUG_ON(!PAGE_ALIGNED(layout->base));
       |                 ^~~~~~~~~~~~
./include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
    78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
       |                                             ^
kernel/module/strict_rwx.c:16:9: note: in expansion of macro 'BUG_ON'
    16 |         BUG_ON(!PAGE_ALIGNED(layout->base));
       |         ^~~~~~

cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:288 : kernel/module/strict_rwx.o] Erreur 1

You have to include <linux/mm.h>

Christophe

#17 lore raw

Re: [PATCH v6 06/13] module: Move strict rwx support to a separate file

Quoted 18 lines · Christophe Leroy

CC kernel/module/strict_rwx.o
In file included from ./include/linux/build_bug.h:5,

                  from ./include/linux/container_of.h:5,
                  from ./include/linux/list.h:5,
                  from ./include/linux/module.h:12,
                  from kernel/module/strict_rwx.c:8:

kernel/module/strict_rwx.c: In function 'frob_rodata':
kernel/module/strict_rwx.c:16:17: error: implicit declaration of function 'PAGE_ALIGNED'; did you mean 'IS_ALIGNED'? [-Werror=implicit-function-declaration]

    16 |         BUG_ON(!PAGE_ALIGNED(layout->base));
       |                 ^~~~~~~~~~~~
./include/linux/compiler.h:78:45: note: in definition of macro 'unlikely'
    78 | # define unlikely(x)    __builtin_expect(!!(x), 0)
       |                                             ^
kernel/module/strict_rwx.c:16:9: note: in expansion of macro 'BUG_ON'
    16 |         BUG_ON(!PAGE_ALIGNED(layout->base));
       |         ^~~~~~
Quoted 7 lines

cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:288 : kernel/module/strict_rwx.o] Erreur 1

You have to include <linux/mm.h>

Christophe,

Strange, I have not seen this before. Locally, looking at kernel/module/strict_rwx.i it is eventually included. Anyhow, you are right. Also, it will not hurt due to the multiple-include optimisation found in include/linux/mm.h.

Kind regards,

Signature · 1 line
Aaron Tomlin
#18 lore raw

Re: [PATCH v6 06/13] module: Move strict rwx support to a separate file

In reply to Aaron Tomlin

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 7 lines

No 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 into
kernel/module/strict_rwx.c.

Quoted 8 lines
---
  kernel/module/Makefile     |  1 +
  kernel/module/internal.h   | 38 +++++++++++++++
  kernel/module/main.c       | 99 +-------------------------------------
  kernel/module/strict_rwx.c | 84 ++++++++++++++++++++++++++++++++
  4 files changed, 125 insertions(+), 97 deletions(-)

create mode 100644 kernel/module/strict_rwx.c

kernel/module/internal.h:182:12: error: 'module_enforce_rwx_sections' defined but not used [-Werror=unused-function] kernel/module/internal.h:181:13: error: 'module_enable_ro' defined but not used [-Werror=unused-function] kernel/module/internal.h:180:13: error: 'module_enable_nx' defined but not used [-Werror=unused-function]
cc1: all warnings being treated as errors
make[3]: *** [scripts/Makefile.build:288: kernel/module/signing.o] Error 1

#19 lore raw

Re: [PATCH v6 06/13] module: Move strict rwx support to a separate file

In reply to Aaron Tomlin

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 55 lines

No 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 into
kernel/module/strict_rwx.c.

---
  kernel/module/Makefile     |  1 +
  kernel/module/internal.h   | 38 +++++++++++++++
  kernel/module/main.c       | 99 +-------------------------------------
  kernel/module/strict_rwx.c | 84 ++++++++++++++++++++++++++++++++
  4 files changed, 125 insertions(+), 97 deletions(-)

create mode 100644 kernel/module/strict_rwx.c

kernel/module/Makefile +1 -0
index 6fb21ebe1aa3..3f48343636ff 100644
@@ -10,4 +10,5 @@ obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
  obj-$(CONFIG_LIVEPATCH) += livepatch.o
  ifdef CONFIG_MODULES
  obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
+obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
  endif
kernel/module/internal.h +14 -0
index 57a715454c9e..f4b7e123d625 100644
@@ -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,30 @@ 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,

kernel/module/internal.h static inline struct module *mod_find(unsigned long addr) · line 152

Quoted 10 lines
kernel/module/internal.h +10 -0
+								     int num_pages));
+#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */
+
+#ifdef CONFIG_STRICT_MODULE_RWX
+void frob_rodata(const struct module_layout *layout,
+		 int (*set_memory)(unsigned long start, int num_pages));
+void frob_ro_after_init(const struct module_layout *layout,
+			int (*set_memory)(unsigned long start, int num_pages));
+void frob_writable_data(const struct module_layout *layout,
+			int (*set_memory)(unsigned long start, int num_pages));

Those three frob_() functions are only used in strict_rwx.c, they should not appear in internal.h and should be static in strict_rwx.c

kernel/module/internal.h static inline struct module *mod_find(unsigned long addr) · line 162

Quoted 10 lines
kernel/module/internal.h +10 -0
+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 void module_enable_nx(const struct module *mod) { }
+static void module_enable_ro(const struct module *mod, bool after_init) {}
+static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
+				       char *secstrings, struct module *mod)

Those three must be static inline

kernel/module/internal.h static inline struct module *mod_find(unsigned long addr) · line 166

Quoted 4 lines
kernel/module/internal.h +4 -0
+{
+	return 0;
+}
+#endif /* CONFIG_STRICT_MODULE_RWX */

Christophe

#20 lore raw

PATCH v6 7/13 module: Move extra signature support out of core code

In reply to Aaron Tomlin

No functional change.

This patch migrates additional module signature check code from core module code into kernel/module/signing.c.

---
 kernel/module/internal.h |  9 +++++
 kernel/module/main.c     | 87 ----------------------------------------
 kernel/module/signing.c  | 77 +++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 87 deletions(-)
kernel/module/internal.h +9 -0
index f4b7e123d625..0fdd9c0cd77d 100644
@@ -164,3 +164,12 @@ static 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
#21 lore raw

PATCH v6 8/13 module: Move kmemleak support to a separate file

In reply to Aaron Tomlin

No 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
index 3f48343636ff..e2a5ae0264f9 100644
@@ -11,4 +11,5 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o
 ifdef CONFIG_MODULES
 obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o
 obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o
+obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o
 endif
kernel/module/debug_kmemleak.c new file +30 -0
new file mode 100644
index 000000000000..12a569d361e8
@@ -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
index 0fdd9c0cd77d..1c9604443e2f 100644
@@ -173,3 +173,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
index c63e10c61694..7dd283959c5c 100644
@@ -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
#22 lore raw

PATCH v6 9/13 module: Move kallsyms support into a separate file

In reply to Aaron Tomlin

No functional change.

This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c

---
 kernel/module/Makefile   |   1 +
 kernel/module/internal.h |  32 +++
 kernel/module/kallsyms.c | 502 ++++++++++++++++++++++++++++++++++++
 kernel/module/main.c     | 531 +--------------------------------------
 4 files changed, 541 insertions(+), 525 deletions(-)
 create mode 100644 kernel/module/kallsyms.c
kernel/module/Makefile +1 -0
index e2a5ae0264f9..a5a0963ba481 100644
@@ -12,4 +12,5 @@ ifdef CONFIG_MODULES
 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
 endif
kernel/module/internal.h +32 -0
index 1c9604443e2f..99b88e2eb479 100644
@@ -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);
@@ -180,3 +193,22 @@ void kmemleak_load_module(const struct module *mod, const struct load_info *info
 static inline void kmemleak_load_module(const struct module *mod,
 					const struct load_info *info) { }
 #endif /* CONFIG_DEBUG_KMEMLEAK */
+
+#ifdef CONFIG_KALLSYMS
+#ifdef CONFIG_STACKTRACE_BUILD_ID
+void init_build_id(struct module *mod, const struct load_info *info);
+#else /* !CONFIG_STACKTRACE_BUILD_ID */
+static inline void init_build_id(struct module *mod, const struct load_info *info) { }
+#endif
+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 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
#23 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 6 lines

No functional change.

This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c

With this patch I get an Oops:

[   36.421711] BUG: Unable to handle kernel data access on write at 
0xbe79bb40
[   36.428435] Faulting instruction address: 0xc008b74c
[   36.433342] Oops: Kernel access of bad area, sig: 11 [#1]
[   36.438672] BE PAGE_SIZE=16K PREEMPT CMPC885
[   36.442947] SAF3000 DIE NOTIFICATION
[   36.446421] Modules linked in:
[   36.449436] CPU: 0 PID: 374 Comm: insmod Not tainted 
5.17.0-rc4-s3k-dev-02274-g7d4ec8831803 #1016
[   36.458211] NIP:  c008b74c LR: c00897ac CTR: c001145c
[   36.463200] REGS: caf8bcf0 TRAP: 0300   Not tainted 
(5.17.0-rc4-s3k-dev-02274-g7d4ec8831803)
[   36.471633] MSR:  00009032 <EE,ME,IR,DR,RI>  CR: 24002842  XER: 00000000
[   36.478261] DAR: be79bb40 DSISR: c2000000
[   36.478261] GPR00: c00899a0 caf8bdb0 c230a980 be74c000 caf8beb8 
00000008 00000000 c035629c
[   36.478261] GPR08: be75c000 caf9c9fc be79bb40 00000004 24002842 
100d166a 00000290 00000000
[   36.478261] GPR16: c0747320 caf9c9fc c11ff918 caf9b2a7 be75c290 
00000550 00000022 c0747210
[   36.478261] GPR24: c11ff8e8 be74c000 c11ff8fc 100b8820 00000000 
00000000 be74c000 caf8beb8
[   36.516729] NIP [c008b74c] add_kallsyms+0x48/0x30c
[   36.521465] LR [c00897ac] load_module+0x16f8/0x2504
[   36.526286] Call Trace:
[   36.528693] [caf8bdb0] [00000208] 0x208 (unreliable)
[   36.533598] [caf8bde0] [c00899a0] load_module+0x18ec/0x2504
[   36.539107] [caf8beb0] [c008a7a8] sys_finit_module+0xb4/0xf8
[   36.544700] [caf8bf30] [c00120a4] ret_from_syscall+0x0/0x28
[   36.550209] --- interrupt: c00 at 0xfd5e7c0
[   36.554339] NIP:  0fd5e7c0 LR: 100144e8 CTR: 10013238
[   36.559331] REGS: caf8bf40 TRAP: 0c00   Not tainted 
(5.17.0-rc4-s3k-dev-02274-g7d4ec8831803)
[   36.567763] MSR:  0000d032 <EE,PR,ME,IR,DR,RI>  CR: 24002222  XER: 
00000000
[   36.574735]
[   36.574735] GPR00: 00000161 7fc5a130 7792f4e0 00000003 100b8820 
00000000 0fd4ded4 0000d032
[   36.574735] GPR08: 00000000 10013238 00000000 00000002 142d2297 
100d166a 100a0920 00000000
[   36.574735] GPR16: 100cac0c 100b0000 1013c3cc 1013d685 100d0000 
100d0000 00000000 100a0900
[   36.574735] GPR24: ffffffa2 ffffffff 1013c3a4 00000003 1013c3cc 
100b8820 1013c3f0 1013c3cc
[   36.610535] NIP [0fd5e7c0] 0xfd5e7c0
[   36.614065] LR [100144e8] 0x100144e8
[   36.617593] --- interrupt: c00
[   36.620609] Instruction dump:
[   36.623534] 7c7e1b78 81040038 8124003c 81430100 55082036 7d0a4214 
1d490028 81240010
[   36.631365] 9103015c 7d295214 8109000c 8143015c <910a0000> 81290014 
8143015c 5529e13e
[   36.639376] ---[ end trace 0000000000000000 ]---

Christophe

#24 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

Le 21/02/2022 à 09:15, Christophe Leroy a écrit :

Quoted 21 lines

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 6 lines

No functional change.

This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c

With this patch I get an Oops:

[   36.421711] BUG: Unable to handle kernel data access on write at 0xbe79bb40
[   36.428435] Faulting instruction address: 0xc008b74c
[   36.433342] Oops: Kernel access of bad area, sig: 11 [#1]
[   36.438672] BE PAGE_SIZE=16K PREEMPT CMPC885
[   36.442947] SAF3000 DIE NOTIFICATION
[   36.446421] Modules linked in:
[   36.449436] CPU: 0 PID: 374 Comm: insmod Not tainted 5.17.0-rc4-s3k-dev-02274-g7d4ec8831803 #1016 [   36.458211] NIP:  c008b74c LR: c00897ac CTR: c001145c
[   36.463200] REGS: caf8bcf0 TRAP: 0300   Not tainted (5.17.0-rc4-s3k-dev-02274-g7d4ec8831803)

Quoted 8 lines

[   36.471633] MSR:  00009032 <EE,ME,IR,DR,RI>  CR: 24002842  XER: 00000000
[   36.478261] DAR: be79bb40 DSISR: c2000000
[   36.478261] GPR00: c00899a0 caf8bdb0 c230a980 be74c000 caf8beb8 00000008 00000000 c035629c [   36.478261] GPR08: be75c000 caf9c9fc be79bb40 00000004 24002842 100d166a 00000290 00000000 [   36.478261] GPR16: c0747320 caf9c9fc c11ff918 caf9b2a7 be75c290 00000550 00000022 c0747210 [   36.478261] GPR24: c11ff8e8 be74c000 c11ff8fc 100b8820 00000000 00000000 be74c000 caf8beb8 [   36.516729] NIP [c008b74c] add_kallsyms+0x48/0x30c
[   36.521465] LR [c00897ac] load_module+0x16f8/0x2504

Fixup:

kernel/module/kallsyms.c +1 -2
index 6c8f1f390cf5..2ee8d2e67068 100644
@@ -171,8 +171,7 @@ 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 = (struct mod_kallsyms __rcu *)mod->init_layout.base +
-		info->mod_kallsyms_init_off;
+	mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off;
 
 	/* The following is safe since this pointer cannot change */
 	rcu_dereference_sched(mod->kallsyms)->symtab = (void *)symsec->sh_addr;

Christophe

#25 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

Quoted 16 lines · Christophe Leroy

Fixup:

kernel/module/kallsyms.c +1 -2
index 6c8f1f390cf5..2ee8d2e67068 100644
@@ -171,8 +171,7 @@ 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 = (struct mod_kallsyms __rcu *)mod->init_layout.base +
-        info->mod_kallsyms_init_off;
+    mod->kallsyms = (void __rcu *)mod->init_layout.base +
 info->mod_kallsyms_init_off;
 
Quoted 2 lines
     /* The following is safe since this pointer cannot change */
     rcu_dereference_sched(mod->kallsyms)->symtab = (void *)symsec->sh_addr;

Agreed.

Signature · 1 line
Aaron Tomlin
maintainer
#26 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

Quoted 17 lines · Aaron Tomlin
Quoted 16 lines · Christophe Leroy

Fixup:

kernel/module/kallsyms.c +1 -2
index 6c8f1f390cf5..2ee8d2e67068 100644
@@ -171,8 +171,7 @@ 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 = (struct mod_kallsyms __rcu *)mod->init_layout.base +
-        info->mod_kallsyms_init_off;
+    mod->kallsyms = (void __rcu *)mod->init_layout.base +
 info->mod_kallsyms_init_off;
 
Quoted 4 lines
Quoted 2 lines
     /* The following is safe since this pointer cannot change */
     rcu_dereference_sched(mod->kallsyms)->symtab = (void *)symsec->sh_addr;

Agreed.

Could you split all of this to a follow-up patch, please? So that 9/13 is really only about moving the code.

Btw, the sparse warnings "dereference of noderef expression" appeared after 5/13 of the series which moved latched RB-tree support, so it does not belong here anyway.

Miroslav

#27 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

In reply to Christophe Leroy
Quoted 45 lines · Christophe Leroy
[   36.421711] BUG: Unable to handle kernel data access on write at
0xbe79bb40
[   36.428435] Faulting instruction address: 0xc008b74c
[   36.433342] Oops: Kernel access of bad area, sig: 11 [#1]
[   36.438672] BE PAGE_SIZE=16K PREEMPT CMPC885
[   36.442947] SAF3000 DIE NOTIFICATION
[   36.446421] Modules linked in:
[   36.449436] CPU: 0 PID: 374 Comm: insmod Not tainted
5.17.0-rc4-s3k-dev-02274-g7d4ec8831803 #1016
[   36.458211] NIP:  c008b74c LR: c00897ac CTR: c001145c
[   36.463200] REGS: caf8bcf0 TRAP: 0300   Not tainted
(5.17.0-rc4-s3k-dev-02274-g7d4ec8831803)
[   36.471633] MSR:  00009032 <EE,ME,IR,DR,RI>  CR: 24002842  XER: 00000000
[   36.478261] DAR: be79bb40 DSISR: c2000000
[   36.478261] GPR00: c00899a0 caf8bdb0 c230a980 be74c000 caf8beb8
00000008 00000000 c035629c
[   36.478261] GPR08: be75c000 caf9c9fc be79bb40 00000004 24002842
100d166a 00000290 00000000
[   36.478261] GPR16: c0747320 caf9c9fc c11ff918 caf9b2a7 be75c290
00000550 00000022 c0747210
[   36.478261] GPR24: c11ff8e8 be74c000 c11ff8fc 100b8820 00000000
00000000 be74c000 caf8beb8
[   36.516729] NIP [c008b74c] add_kallsyms+0x48/0x30c
[   36.521465] LR [c00897ac] load_module+0x16f8/0x2504
[   36.526286] Call Trace:
[   36.528693] [caf8bdb0] [00000208] 0x208 (unreliable)
[   36.533598] [caf8bde0] [c00899a0] load_module+0x18ec/0x2504
[   36.539107] [caf8beb0] [c008a7a8] sys_finit_module+0xb4/0xf8
[   36.544700] [caf8bf30] [c00120a4] ret_from_syscall+0x0/0x28
[   36.550209] --- interrupt: c00 at 0xfd5e7c0
[   36.554339] NIP:  0fd5e7c0 LR: 100144e8 CTR: 10013238
[   36.559331] REGS: caf8bf40 TRAP: 0c00   Not tainted
(5.17.0-rc4-s3k-dev-02274-g7d4ec8831803)
[   36.567763] MSR:  0000d032 <EE,PR,ME,IR,DR,RI>  CR: 24002222  XER:
00000000
[   36.574735]
[   36.574735] GPR00: 00000161 7fc5a130 7792f4e0 00000003 100b8820
00000000 0fd4ded4 0000d032
[   36.574735] GPR08: 00000000 10013238 00000000 00000002 142d2297
100d166a 100a0920 00000000
[   36.574735] GPR16: 100cac0c 100b0000 1013c3cc 1013d685 100d0000
100d0000 00000000 100a0900
[   36.574735] GPR24: ffffffa2 ffffffff 1013c3a4 00000003 1013c3cc
100b8820 1013c3f0 1013c3cc
[   36.610535] NIP [0fd5e7c0] 0xfd5e7c0
Quoted 8 lines
[   36.614065] LR [100144e8] 0x100144e8
[   36.617593] --- interrupt: c00
[   36.620609] Instruction dump:
[   36.623534] 7c7e1b78 81040038 8124003c 81430100 55082036 7d0a4214
1d490028 81240010
[   36.631365] 9103015c 7d295214 8109000c 8143015c <910a0000> 81290014
8143015c 5529e13e
[   36.639376] ---[ end trace 0000000000000000 ]---

Hi Christophe,

Unfortunately, I do not have the debuginfo data. Albeit, based on the stack trace, I suspect this was the result of the dereference attempt (below) due to the invalid pointer stored in mod->kallsyms i.e. mod->kallsyms = (struct mod_kallsyms __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off:

177 /* The following is safe since this pointer cannot change */
178 rcu_dereference_sched(mod->kallsyms)->symtab = (void
*)symsec->sh_addr;

Kind regards,

Signature · 1 line
Aaron Tomlin
#28 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

In reply to Aaron Tomlin

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 5 lines

No functional change.

This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c

Quoted 9 lines
---
  kernel/module/Makefile   |   1 +
  kernel/module/internal.h |  32 +++
  kernel/module/kallsyms.c | 502 ++++++++++++++++++++++++++++++++++++
  kernel/module/main.c     | 531 +--------------------------------------
  4 files changed, 541 insertions(+), 525 deletions(-)

create mode 100644 kernel/module/kallsyms.c

CC kernel/module/main.o
kernel/module/main.c: In function 'load_module':
kernel/module/main.c:3379:9: error: implicit declaration of function 'init_build_id' [-Werror=implicit-function-declaration]

  3379 |         init_build_id(mod, info);
       |         ^~~~~~~~~~~~~

cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:288 : kernel/module/main.o] Erreur 1

Christophe

reviewer
#29 lore raw

Re: [PATCH v6 09/13] module: Move kallsyms support into a separate file

Quoted 16 lines · Christophe Leroy

Le 18/02/2022 à 22:25, Aaron Tomlin a écrit :

Quoted 5 lines

No functional change.

This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c

Quoted 9 lines
---
  kernel/module/Makefile   |   1 +
  kernel/module/internal.h |  32 +++
  kernel/module/kallsyms.c | 502 ++++++++++++++++++++++++++++++++++++
  kernel/module/main.c     | 531 +--------------------------------------
  4 files changed, 541 insertions(+), 525 deletions(-)

create mode 100644 kernel/module/kallsyms.c

Quoted 8 lines

CC kernel/module/main.o
kernel/module/main.c: In function 'load_module':
kernel/module/main.c:3379:9: error: implicit declaration of function 'init_build_id' [-Werror=implicit-function-declaration]

  3379 |         init_build_id(mod, info);
       |         ^~~~~~~~~~~~~

cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:288 : kernel/module/main.o] Erreur 1

Christophe,

I assume both Kconfig option CONFIG_KALLSYMS and CONFIG_STACKTRACE_BUILD_ID was not enabled. I'll address this.

Thanks,

Signature · 1 line
Aaron Tomlin
#30 lore raw

PATCH v6 10/13 module: Move procfs support into a separate file

In reply to Aaron Tomlin

No 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
index a5a0963ba481..f66fda0b41cc 100644
@@ -13,4 +13,5 @@ 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
 endif
kernel/module/internal.h +1 -0
index 99b88e2eb479..ddb37024a0d6 100644
@@ -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
maintainer
#31 lore raw
In reply to Aaron Tomlin
Quoted 8 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' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Please let me know your thoughts.

Fantastic, thanks for doing all this work, I've pushed this out to modules-next so that the testing can start as this will be in linux-next soon. I'll obviously wait for more reviews, we have a long time before this gets merged to Linus, so just want to start getting testing done now rather than later. And other folks are depending on your changes to start getting their own code up too.

Thanks!

Luis

maintainer
#32 lore raw
Quoted 10 lines · Luis Chamberlain
Quoted 8 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' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Please let me know your thoughts.

Quoted 6 lines

Fantastic, thanks for doing all this work, I've pushed this out to modules-next so that the testing can start as this will be in linux-next soon. I'll obviously wait for more reviews, we have a long time before this gets merged to Linus, so just want to start getting testing done now rather than later. And other folks are depending on your changes to start getting their own code up too.

Aaron's series is unfortunately split. Could you also push out the remaining 3 patches ([email protected]), please?

Miroslav

#33 lore raw
In reply to Luis Chamberlain

Le 19/02/2022 à 03:12, Luis Chamberlain a écrit :

Quoted 10 lines · Aaron Tomlin
Quoted 8 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' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Please let me know your thoughts.

Quoted 7 lines

Fantastic, thanks for doing all this work, I've pushed this out to modules-next so that the testing can start as this will be in linux-next soon. I'll obviously wait for more reviews, we have a long time before this gets merged to Linus, so just want to start getting testing done now rather than later. And other folks are depending on your changes to start getting their own code up too.

Hi Luis,

modules-next misses the 3 last patches from Aaron.

Aaron's series as build problems, I sent 4 fixups which allows it to build, then I rebased my series on top of that.

And I added on top of it some misc cleanups.

All this has undergone kisskb build test at
http://kisskb.ellerman.id.au/kisskb/head/d8ee36c58284baf315e8aa3532a8d97abae8026d/
This only build failure (indeed a final link failure) is unrelated to my series.

Everything is also available on https://github.com/chleroy/linux.git in branch module-v4

Looking forward to getting everything into modules-next hence into linux-next.

Christophe

#34 lore raw
In reply to Luis Chamberlain
Quoted 10 lines · Luis Chamberlain
Quoted 8 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' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Please let me know your thoughts.

Quoted 6 lines

Fantastic, thanks for doing all this work, I've pushed this out to modules-next so that the testing can start as this will be in linux-next soon. I'll obviously wait for more reviews, we have a long time before this gets merged to Linus, so just want to start getting testing done now rather than later. And other folks are depending on your changes to start getting their own code up too.

Hi Luis,

No problem. Unfortunately, this was not the complete series. I can send a v7 later today with the suggested improvements made by Christophe.

Kind regards,

Signature · 1 line
Aaron Tomlin