module.lds.S: Fix modules on 32-bit parisc architecture
Subsystems (2)
PATCH v2 1/1 module.lds.S: Fix modules on 32-bit parisc architecture
On the 32-bit parisc architecture, we always used the -ffunction-sections compiler option to tell the compiler to put the functions into seperate text sections. This is necessary, otherwise "big" kernel modules like ext4 or ipv6 fail to load because some branches won't be able to reach their stubs.
Commit 1ba9f8979426 ("vmlinux.lds: Unify TEXT_MAIN, DATA_MAIN, and related macros") broke this for parisc because all text sections will get unconditionally merged now.
Introduce the ARCH_WANTS_MODULES_TEXT_SECTIONS config option which avoids the text section merge for modules, and fix this issue by enabling this option by default for 32-bit parisc.
v2: Introduce and use ARCH_WANTS_MODULES_TEXT_SECTIONS option
arch/Kconfig +7 -0
@@ -1128,6 +1128,13 @@ config ARCH_WANTS_MODULES_DATA_IN_VMALLOC For architectures like powerpc/32 which have constraints on module allocation and need to allocate module data outside of module area. +config ARCH_WANTS_MODULES_TEXT_SECTIONS + bool + help + For architectures like 32-bit parisc which require that functions in + modules have to keep code in own text sections (-ffuntion-sections) + and to avoid merging all text into one big text section, + config ARCH_WANTS_EXECMEM_LATE bool help
arch/parisc/Kconfig +1 -0
@@ -8,6 +8,7 @@ config PARISC select HAVE_FUNCTION_GRAPH_TRACER select HAVE_SYSCALL_TRACEPOINTS select ARCH_WANT_FRAME_POINTERS + select ARCH_WANTS_MODULES_TEXT_SECTIONS if !64BIT select ARCH_HAS_CPU_CACHE_ALIASING select ARCH_HAS_DMA_ALLOC if PA11 select ARCH_HAS_DMA_OPS
scripts/module.lds.S +2 -0
@@ -41,9 +41,11 @@ SECTIONS { __kcfi_traps : { KEEP(*(.kcfi_traps)) } #endif +#ifndef CONFIG_ARCH_WANTS_MODULES_TEXT_SECTIONS .text : { *(.text .text.[0-9a-zA-Z_]*) } +#endif .bss : { *(.bss .bss.[0-9a-zA-Z_]*)
Quoted 27 lines · Helge Deller
On the 32-bit parisc architecture, we always used the -ffunction-sections compiler option to tell the compiler to put the functions into seperate text sections. This is necessary, otherwise "big" kernel modules like ext4 or ipv6 fail to load because some branches won't be able to reach their stubs.
Commit
1ba9f8979426("vmlinux.lds: UnifyTEXT_MAIN,DATA_MAIN, and related macros") broke this for parisc because all text sections will get unconditionally merged now.Introduce the
ARCH_WANTS_MODULES_TEXT_SECTIONSconfig option which avoids the text section merge for modules, and fix this issue by enabling this option by default for 32-bit parisc.v2: Introduce and use
ARCH_WANTS_MODULES_TEXT_SECTIONSoptionFixes 1ba9f8979426 ("vmlinux.lds: Unify TEXT_MAIN, DATA_MAIN, and related macros")Cc Josh Poimboeuf <[email protected]>Cc [email protected] # v6.19+Suggested-by Sami Tolvanen <[email protected]>Signed-off-by Helge Deller <[email protected]>arch/Kconfig +0
-0
arch/Kconfig config ARCH_WANTS_MODULES_DATA_IN_VMALLOC · line 1137
Quoted 10 lines
arch/Kconfig +7
-0@@ -1128,6 +1128,13 @@ config ARCH_WANTS_MODULES_DATA_IN_VMALLOC For architectures like powerpc/32 which have constraints on module allocation and need to allocate module data outside of module area. +config ARCH_WANTS_MODULES_TEXT_SECTIONS + bool + help + For architectures like 32-bit parisc which require that functions in + modules have to keep code in own text sections (-ffuntion-sections) + and to avoid merging all text into one big text section, +
Typos: '-ffuntion-sections' -> '-ffunction-sections' and ',' -> '.'
Otherwise, this looks ok to me. Feel free to add:
Signature · 2 lines
Thanks, Petr