History

init/modpost: conditionally check section mismatch to __meminit*

This reverts commit eb8f689046b8 ("Use separate sections for __dev/ _cpu/__mem code/data"). Check section mismatch to __meminit* only when CONFIG_MEMORY_HOTPLUG=n. With this change, the linker script and modpost become simpler, and we can get rid of the __ref annotations from the memory hotplug code. [sfr@canb.auug.org.au: remove MEM_KEEP from arch/powerpc/kernel/vmlinux.lds.S] Link: https://lkml.kernel.org/r/20240710093213.2aefb25f@canb.auug.org.au Link: https://lkml.kernel.org/r/20240706160511.2331061-2-masahiroy@kernel.org Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Reviewed-by: Wei Yang <richard.weiyang@gmail.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Masahiro Yamada committed 2 years ago

Commit 73db3ab1 parent 7a7127a4 files · +15 −38Browse files

Unified · Split

4 files
  1. arch/powerpc/kernel/vmlinux.lds.S +0 −2
  2. include/asm-generic/vmlinux.lds.h +2 −16
  3. include/linux/init.h +9 −5
  4. scripts/mod/modpost.c +4 −15
arch/powerpc/kernel/vmlinux.lds.S+0−2
@@ -123,8 +123,6 @@ SECTIONS · 122 unmodified lines
123123 */
124124 *(.sfpr);
125125 *(.text.asan.* .text.tsan.*)
126− MEM_KEEP(init.text)
127− MEM_KEEP(exit.text)
128126 } :text
129127
130128 . = ALIGN(PAGE_SIZE);
include/asm-generic/vmlinux.lds.h+2−16
@@ -141,14 +141,6 @@ · 140 unmodified lines
141141 * often happens at runtime)
142142 */
143143
144−#if defined(CONFIG_MEMORY_HOTPLUG)
145−#define MEM_KEEP(sec) *(.mem##sec)
146−#define MEM_DISCARD(sec)
147−#else
148−#define MEM_KEEP(sec)
149−#define MEM_DISCARD(sec) *(.mem##sec)
150−#endif
151−
152144 #ifndef CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE
153145 #define KEEP_PATCHABLE KEEP(*(__patchable_function_entries))
154146 #define PATCHABLE_DISCARDS
@@ -357,7 +349,6 @@ · 202 unmodified lines
357349 *(.data..decrypted) \
358350 *(.ref.data) \
359351 *(.data..shared_aligned) /* percpu related */ \
360− MEM_KEEP(init.data*) \
361352 *(.data.unlikely) \
362353 __start_once = .; \
363354 *(.data.once) \
@@ -542,7 +533,6 @@ · 178 unmodified lines
542533 /* __*init sections */ \
543534 __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
544535 *(.ref.rodata) \
545− MEM_KEEP(init.rodata) \
546536 } \
547537 \
548538 /* Built-in module parameters. */ \
@@ -593,8 +583,7 @@ · 44 unmodified lines
593583 *(.text.unknown .text.unknown.*) \
594584 NOINSTR_TEXT \
595585 *(.ref.text) \
596− *(.text.asan.* .text.tsan.*) \
597− MEM_KEEP(init.text*) \
586+ *(.text.asan.* .text.tsan.*)
598587
599588
600589 /* sched.text is aling to function alignment to secure we have same
@@ -701,7 +690,6 @@ · 100 unmodified lines
701690 #define INIT_DATA \
702691 KEEP(*(SORT(___kentry+*))) \
703692 *(.init.data .init.data.*) \
704− MEM_DISCARD(init.data*) \
705693 KERNEL_CTORS() \
706694 MCOUNT_REC() \
707695 *(.init.rodata .init.rodata.*) \
@@ -709,7 +697,6 @@ · 1 unmodified line
709697 TRACE_SYSCALLS() \
710698 KPROBE_BLACKLIST() \
711699 ERROR_INJECT_WHITELIST() \
712− MEM_DISCARD(init.rodata) \
713700 CLK_OF_TABLES() \
714701 RESERVEDMEM_OF_TABLES() \
715702 TIMER_OF_TABLES() \
@@ -727,8 +714,7 @@ · 11 unmodified lines
727714
728715 #define INIT_TEXT \
729716 *(.init.text .init.text.*) \
730− *(.text.startup) \
731− MEM_DISCARD(init.text*)
717+ *(.text.startup)
732718
733719 #define EXIT_DATA \
734720 *(.exit.data .exit.data.*) \
include/linux/init.h+9−5
@@ -84,11 +84,15 @@ · 83 unmodified lines
8484
8585 #define __exit __section(".exit.text") __exitused __cold notrace
8686
87−/* Used for MEMORY_HOTPLUG */
88−#define __meminit __section(".meminit.text") __cold notrace \
89− __latent_entropy
90−#define __meminitdata __section(".meminit.data")
91−#define __meminitconst __section(".meminit.rodata")
87+#ifdef CONFIG_MEMORY_HOTPLUG
88+#define __meminit
89+#define __meminitdata
90+#define __meminitconst
91+#else
92+#define __meminit __init
93+#define __meminitdata __initdata
94+#define __meminitconst __initconst
95+#endif
9296
9397 /* For assembly routines */
9498 #define __HEAD .section ".head.text","ax"
scripts/mod/modpost.c+4−15
@@ -776,17 +776,14 @@ static void check_section(const char *modname, struct elf_info *elf, · 775 unmodified lines
776776
777777
778778 #define ALL_INIT_DATA_SECTIONS \
779− ".init.setup", ".init.rodata", ".meminit.rodata", \
780− ".init.data", ".meminit.data"
779+ ".init.setup", ".init.rodata", ".init.data"
781780
782781 #define ALL_PCI_INIT_SECTIONS \
783782 ".pci_fixup_early", ".pci_fixup_header", ".pci_fixup_final", \
784783 ".pci_fixup_enable", ".pci_fixup_resume", \
785784 ".pci_fixup_resume_early", ".pci_fixup_suspend"
786785
787−#define ALL_XXXINIT_SECTIONS ".meminit.*"
788−
789−#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
786+#define ALL_INIT_SECTIONS ".init.*"
790787 #define ALL_EXIT_SECTIONS ".exit.*"
791788
792789 #define DATA_SECTIONS ".data", ".data.rel"
@@ -797,9 +794,7 @@ static void check_section(const char *modname, struct elf_info *elf, · 4 unmodified lines
797794 ".fixup", ".entry.text", ".exception.text", \
798795 ".coldtext", ".softirqentry.text"
799796
800−#define INIT_SECTIONS ".init.*"
801−
802−#define ALL_TEXT_SECTIONS ".init.text", ".meminit.text", ".exit.text", \
797+#define ALL_TEXT_SECTIONS ".init.text", ".exit.text", \
803798 TEXT_SECTIONS, OTHER_TEXT_SECTIONS
804799
805800 enum mismatch {
@@ -839,12 +834,6 @@ static const struct sectioncheck sectioncheck[] = { · 33 unmodified lines
839834 .bad_tosec = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL },
840835 .mismatch = TEXTDATA_TO_ANY_INIT_EXIT,
841836 },
842−/* Do not reference init code/data from meminit code/data */
843−{
844− .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
845− .bad_tosec = { INIT_SECTIONS, NULL },
846− .mismatch = XXXINIT_TO_SOME_INIT,
847−},
848837 /* Do not use exit code/data from init code */
849838 {
850839 .fromsec = { ALL_INIT_SECTIONS, NULL },
@@ -859,7 +848,7 @@ static const struct sectioncheck sectioncheck[] = { · 8 unmodified lines
859848 },
860849 {
861850 .fromsec = { ALL_PCI_INIT_SECTIONS, NULL },
862− .bad_tosec = { INIT_SECTIONS, NULL },
851+ .bad_tosec = { ALL_INIT_SECTIONS, NULL },
863852 .mismatch = ANY_INIT_TO_ANY_EXIT,
864853 },
865854 {