Skip to content

module: core code clean up

Aaron Tomlin linux-modules lkml 16 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v12 Latest14 patches 4 repliesIn review
  2. v1114 patches 17 repliesSuperseded
  3. v1014 patches 4 repliesSuperseded
Earlier versions · 13
VersionPostedPatchesRepliesStatus
v914 patches33 repliesSuperseded
v813 patches29 repliesSuperseded
v713 patches2 repliesSuperseded
v613 patches24 repliesSuperseded
v513 patches35 repliesSuperseded
v4 RFC posting 2/213 patches0 repliesSuperseded
v4 RFC posting 1/213 patches25 repliesSuperseded
v3 RFC posting 4/413 patches2 repliesSuperseded
v3 RFC posting 3/413 patches0 repliesSuperseded
v3 RFC posting 2/413 patches0 repliesSuperseded
v3 RFC posting 1/413 patches0 repliesSuperseded
v2 RFC12 of 13 patches12 repliesSuperseded
v1 RFC12 patches4 repliesSuperseded

Patches in v12 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14module: Move all into module/MAINTAINERS kernel/Makefile kernel/module/Makefile +4 more+17 -810 replies
2/14module: Simple refactor in preparation for splitkernel/module/internal.h kernel/module/main.c+23 -200 replies
3/14module: Make internal.h and decompress.c more compliantkernel/module/decompress.c kernel/module/internal.h+7 -20 replies
4/14module: Move livepatch support to a separate fileMAINTAINERS include/linux/module.h kernel/module/Makefile +3 more+111 -980 replies
5/14module: Move latched RB-tree support to a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/main.c +1 more+147 -1260 replies
6/14module: Move strict rwx support to a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/main.c +1 more+120 -970 replies
7/14module: Move extra signature support out of core codeinclude/linux/module.h kernel/module/internal.h kernel/module/main.c +1 more+93 -920 replies
8/14module: Move kmemleak support to a separate filekernel/module/Makefile kernel/module/debug_kmemleak.c kernel/module/internal.h +1 more+38 -270 replies
9/14module: Move kallsyms support into a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/kallsyms.c +1 more+538 -5250 replies
10/14module: kallsyms: Fix suspicious rcu usagekernel/module/kallsyms.c+22 -120 replies
11/14module: Move procfs support into a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/main.c +1 more+145 -1300 replies
12/14module: Move sysfs support into a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/main.c +1 more+461 -4660 replies
13/14module: Move kdb module related code out of main kdb codeMAINTAINERS include/linux/kdb.h kernel/debug/kdb/kdb_io.c +7 more+59 -600 replies
14/14module: Move version support into a separate filekernel/module/Makefile kernel/module/internal.h kernel/module/main.c +1 more+166 -1480 replies

Reviews trailers per patch

12 of 14 patches have a Reviewed-by or Acked-by.

PatchChristophe LeroyPetr MladekDaniel ThompsonLuis ChamberlainAaron Tomlin
1/14R-b A-b R-b
2/14R-b
3/14R-b
4/14R-b T-b
5/14R-b
6/14R-b
7/14R-b
8/14R-b
9/14
10/14
11/14R-b
12/14R-b
13/14R-b A-b
14/14R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v12 thread

Cover letter [PATCH v12 00/14] 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 b47d5a4f6b8d ("Merge tag 'audit-pr-20220321' of
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit").

No changes in this iteration. Each patch has the same In-Reply-To.

Changes since v10 [2]
- Removed kdb_modules as it is now redundant (Christophe Leroy)
- Removed the include of linux/module.h from any source file under kernel/debug/kdb
- Addressed minor style notice i.e. missing a blank line after declarations

Changes since v9 [3]
- 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 [4]

- Resolved the reported lockdep warnings in kernel/module/kallsyms.c (Petr Mladek)

Changes since v7 [5]

- Removed redundant ifdef CONFIG_MODULES and endif pairing from kernel/module/Makefile

Changes since v6 [6]

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

- 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/lkml/[email protected]/
[4]: https://lore.kernel.org/all/[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/[email protected]/
[10]: https://lore.kernel.org/lkml/203348805c9ac9851d8939d15cb9802ef047b5e2.1643919758.git.christophe.leroy@csgroup.eu/
[11]: https://lore.kernel.org/lkml/[email protected]/
[12]: https://lore.kernel.org/lkml/[email protected]/
[13]: 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_io.c                     |    1 -
 kernel/debug/kdb/kdb_keyboard.c               |    1 -
 kernel/debug/kdb/kdb_main.c                   |   49 -
 kernel/debug/kdb/kdb_private.h                |    4 -
 kernel/debug/kdb/kdb_support.c                |    1 -
 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                           |   56 +
 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 -
 25 files changed, 2075 insertions(+), 1939 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.c

base-commit: b47d5a4f6b8d42f8a8fbe891b36215e4fddc53be

Signature · 1 line
2.34.1