Second round of Kbuild fixes for 7.0

- Split out .modinfo section from ELF_DETAILS macro, as that macro may be used in other areas that expect to discard .modinfo, breaking certain image layouts - Adjust genksyms parser to handle optional attributes in certain declarations, necessary after commit 07919126ec ("netfilter: annotate NAT helper hook pointers with __rcu") - Include resolve_btfids in external module build created by scripts/package/install-extmod-build when it may be run on external modules - Avoid removing objtool binary with 'make clean', as it is required for external module builds -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQR74yXHMTGczQHYypIdayaRccAalgUCaat33gAKCRAdayaRccAa lizMAQCxm0P5WsJf3ydYR+5ZzzM7wreNtpMVMXsCbwOKBGY3VwEAyvB7om1a00Ex Z6WFa9P4VKW+L4PWMnWoyxcnvl/CdgM= =mvIb -----END PGP SIGNATURE----- Merge tag 'kbuild-fixes-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux Pull Kbuild fixes from Nathan Chancellor: - Split out .modinfo section from ELF_DETAILS macro, as that macro may be used in other areas that expect to discard .modinfo, breaking certain image layouts - Adjust genksyms parser to handle optional attributes in certain declarations, necessary after commit 07919126ec ("netfilter: annotate NAT helper hook pointers with __rcu") - Include resolve_btfids in external module build created by scripts/package/install-extmod-build when it may be run on external modules - Avoid removing objtool binary with 'make clean', as it is required for external module builds * tag 'kbuild-fixes-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux: kbuild: Leave objtool binary around with 'make clean' kbuild: install-extmod-build: Package resolve_btfids if necessary genksyms: Fix parsing a declarator with a preceding attribute kbuild: Split .modinfo out from ELF_DETAILS
2026-03-07 21:24:37 +01:00 · 2026-03-06 20:27:13 -08:00 · 2026-03-06 20:27:13 -08:00 · 4ae12d8bd9
commit 4ae12d8bd9
parent 591d8796b2 fdb12c8a24
31 changed files with 44 additions and 11 deletions
--- a/8
+++ b/8
@ -1497,13 +1497,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),)
 	$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean
 endif

-PHONY += objtool_clean
+PHONY += objtool_clean objtool_mrproper

 objtool_O = $(abspath $(objtree))/tools/objtool

-objtool_clean:
+objtool_clean objtool_mrproper:
 ifneq ($(wildcard $(objtool_O)),)
-	$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean
+	$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) $(patsubst objtool_%,%,$@)
 endif

 tools/: FORCE
@ -1686,7 +1686,7 @@ PHONY += $(mrproper-dirs) mrproper
 $(mrproper-dirs):
 	$(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)

-mrproper: clean $(mrproper-dirs)
+mrproper: clean objtool_mrproper $(mrproper-dirs)
 	$(call cmd,rmfiles)
 	@find . $(RCS_FIND_IGNORE) \
 		\( -name '*.rmeta' \) \
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@ -71,6 +71,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@ -123,6 +123,7 @@ SECTIONS
 	_end = . ;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS
 	DISCARDS

--- a/arch/arm/boot/compressed/vmlinux.lds.S
+++ b/arch/arm/boot/compressed/vmlinux.lds.S
@ -21,6 +21,7 @@ SECTIONS
    COMMON_DISCARDS
    *(.ARM.exidx*)
    *(.ARM.extab*)
+    *(.modinfo)
    *(.note.*)
    *(.rel.*)
    *(.printk_index)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@ -154,6 +154,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ARM_DETAILS

 	ARM_ASSERTS
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@ -153,6 +153,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ARM_DETAILS

 	ARM_ASSERTS
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@ -349,6 +349,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	HEAD_SYMBOLS
--- a/arch/csky/kernel/vmlinux.lds.S
+++ b/arch/csky/kernel/vmlinux.lds.S
@ -109,6 +109,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@ -62,6 +62,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.hexagon.attributes 0 : { *(.hexagon.attributes) }

--- a/arch/loongarch/kernel/vmlinux.lds.S
+++ b/arch/loongarch/kernel/vmlinux.lds.S
@ -147,6 +147,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 #ifdef CONFIG_EFI_STUB
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@ -85,6 +85,7 @@ SECTIONS {
 	_end = .;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/* Sections to be discarded */
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@ -58,6 +58,7 @@ SECTIONS
  _end = . ;

  STABS_DEBUG
+  MODINFO
  ELF_DETAILS

  /* Sections to be discarded */
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@ -51,6 +51,7 @@ __init_begin = .;
  _end = . ;

  STABS_DEBUG
+  MODINFO
  ELF_DETAILS

  /* Sections to be discarded */
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@ -217,6 +217,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/* These must appear regardless of  .  */
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@ -57,6 +57,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@ -101,6 +101,7 @@ SECTIONS
 	/* Throw in the debugging sections */
 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

        /* Sections to be discarded -- must be last */
--- a/arch/parisc/boot/compressed/vmlinux.lds.S
+++ b/arch/parisc/boot/compressed/vmlinux.lds.S
@ -90,6 +90,7 @@ SECTIONS
 	/* Sections to be discarded */
 	DISCARDS
 	/DISCARD/ : {
+		*(.modinfo)
 #ifdef CONFIG_64BIT
 		/* temporary hack until binutils is fixed to not emit these
 		 * for static binaries
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@ -165,6 +165,7 @@ SECTIONS
 	_end = . ;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.note 0 : { *(.note) }

--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@ -397,6 +397,7 @@ SECTIONS
 	_end = . ;

 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@ -170,6 +170,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.riscv.attributes 0 : { *(.riscv.attributes) }

--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@ -221,6 +221,7 @@ SECTIONS
 	/* Debugging sections.	*/
 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/*
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@ -89,6 +89,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@ -191,6 +191,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@ -172,6 +172,7 @@ SECTIONS

  STABS_DEBUG
  DWARF_DEBUG
+  MODINFO
  ELF_DETAILS

  DISCARDS
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@ -113,6 +113,7 @@ SECTIONS

  STABS_DEBUG
  DWARF_DEBUG
+  MODINFO
  ELF_DETAILS

  DISCARDS
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@ -88,7 +88,7 @@ SECTIONS
 	/DISCARD/ : {
 		*(.dynamic) *(.dynsym) *(.dynstr) *(.dynbss)
 		*(.hash) *(.gnu.hash)
-		*(.note.*)
+		*(.note.*) *(.modinfo)
 	}

 	.got.plt (INFO) : {
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@ -427,6 +427,7 @@ SECTIONS
 	.llvm_bb_addr_map : { *(.llvm_bb_addr_map) }
 #endif

+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@ -848,12 +848,14 @@

 /* Required sections not related to debugging. */
 #define ELF_DETAILS							\
-		.modinfo : { *(.modinfo) . = ALIGN(8); }		\
 		.comment 0 : { *(.comment) }				\
 		.symtab 0 : { *(.symtab) }				\
 		.strtab 0 : { *(.strtab) }				\
 		.shstrtab 0 : { *(.shstrtab) }

+#define MODINFO								\
+		.modinfo : { *(.modinfo) . = ALIGN(8); }
+
 #ifdef CONFIG_GENERIC_BUG
 #define BUG_TABLE							\
 	. = ALIGN(8);							\
--- a/scripts/genksyms/parse.y
+++ b/scripts/genksyms/parse.y
@ -325,8 +325,8 @@ direct_declarator:
 		{ $$ = $4; }
 	| direct_declarator BRACKET_PHRASE
 		{ $$ = $2; }
-	| '(' declarator ')'
-		{ $$ = $3; }
+	| '(' attribute_opt declarator ')'
+		{ $$ = $4; }
 	;

 /* Nested declarators differ from regular declarators in that they do
--- a/scripts/package/install-extmod-build
+++ b/scripts/package/install-extmod-build
@ -32,6 +32,10 @@ mkdir -p "${destdir}"
 		echo tools/objtool/objtool
 	fi

+	if is_enabled CONFIG_DEBUG_INFO_BTF_MODULES; then
+		echo tools/bpf/resolve_btfids/resolve_btfids
+	fi
+
 	echo Module.symvers
 	echo "arch/${SRCARCH}/include/generated"
 	echo include/config/auto.conf
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@ -142,13 +142,15 @@ $(LIBSUBCMD)-clean:
 	$(Q)$(RM) -r -- $(LIBSUBCMD_OUTPUT)

 clean: $(LIBSUBCMD)-clean
-	$(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)
-	$(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
+	$(Q)find $(OUTPUT) \( -name '*.o' -o -name '\.*.cmd' -o -name '\.*.d' \) -type f -print | xargs $(RM)
 	$(Q)$(RM) $(OUTPUT)arch/x86/lib/cpu-feature-names.c $(OUTPUT)fixdep
 	$(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep
 	$(Q)$(RM) -- $(OUTPUT)FEATURE-DUMP.objtool
 	$(Q)$(RM) -r -- $(OUTPUT)feature

+mrproper: clean
+	$(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)
+
 FORCE:

-.PHONY: clean FORCE
+.PHONY: clean mrproper FORCE