Commit 71d815bf authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Masahiro Yamada
Browse files

kbuild: Strip runtime const RELA sections correctly 

Due to the fact that runtime const ELF sections are named without a
leading period or double underscore, the RSTRIP logic that removes the
static RELA sections from vmlinux fails to identify them. This results
in a situation like below, where some sections that were supposed to get
removed are left behind.

  [Nr] Name                              Type            Address          Off     Size   ES Flg Lk Inf Al

  [58] runtime_shift_d_hash_shift        PROGBITS        ffffffff83500f50 2900f50 000014 00   A  0   0  1
  [59] .relaruntime_shift_d_hash_shift   RELA            0000000000000000 55b6f00 000078 18   I 70  58  8
  [60] runtime_ptr_dentry_hashtable      PROGBITS        ffffffff83500f68 2900f68 000014 00   A  0   0  1
  [61] .relaruntime_ptr_dentry_hashtable RELA            0000000000000000 55b6f78 000078 18   I 70  60  8
  [62] runtime_ptr_USER_PTR_MAX          PROGBITS        ffffffff83500f80 2900f80 000238 00   A  0   0  1
  [63] .relaruntime_ptr_USER_PTR_MAX     RELA            0000000000000000 55b6ff0 000d50 18   I 70  62  8

So tweak the match expression to strip all sections starting with .rel.
While at it, consolidate the logic used by RISC-V, s390 and x86 into a
single shared Makefile library command.

Link: https://lore.kernel.org/all/CAHk-=wjk3ynjomNvFN8jf9A1k=qSc=JFF591W00uXj-qqNUxPQ@mail.gmail.com/


Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Tested-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Tested-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent a409fc14

arch/riscv/Makefile.postlink

+2 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ __archpost: 


-include include/config/auto.conf

include $(srctree)/scripts/Kbuild.include

include $(srctree)/scripts/Makefile.lib



quiet_cmd_relocs_check = CHKREL  $@

cmd_relocs_check = 							\
@@ -19,11 +20,6 @@ ifdef CONFIG_RELOCATABLE 
quiet_cmd_cp_vmlinux_relocs = CPREL   vmlinux.relocs

cmd_cp_vmlinux_relocs = cp vmlinux vmlinux.relocs



quiet_cmd_relocs_strip = STRIPREL $@

cmd_relocs_strip = $(OBJCOPY)   --remove-section='.rel.*'       \

                                --remove-section='.rel__*'      \

                                --remove-section='.rela.*'      \

                                --remove-section='.rela__*' $@

endif



# `@true` prevents complaint when there is nothing to be done
@@ -33,7 +29,7 @@ vmlinux: FORCE 
ifdef CONFIG_RELOCATABLE

	$(call if_changed,relocs_check)

	$(call if_changed,cp_vmlinux_relocs)

	$(call if_changed,relocs_strip)

	$(call if_changed,strip_relocs)

endif



clean:

arch/s390/Makefile.postlink

+1 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ __archpost: 


-include include/config/auto.conf

include $(srctree)/scripts/Kbuild.include

include $(srctree)/scripts/Makefile.lib



CMD_RELOCS=arch/s390/tools/relocs

OUT_RELOCS = arch/s390/boot
@@ -19,11 +20,6 @@ quiet_cmd_relocs = RELOCS $(OUT_RELOCS)/relocs.S 
	mkdir -p $(OUT_RELOCS); \

	$(CMD_RELOCS) $@ > $(OUT_RELOCS)/relocs.S



quiet_cmd_strip_relocs = RSTRIP  $@

      cmd_strip_relocs = \

	$(OBJCOPY) --remove-section='.rel.*' --remove-section='.rel__*' \

		   --remove-section='.rela.*' --remove-section='.rela__*' $@



vmlinux: FORCE

	$(call cmd,relocs)

	$(call cmd,strip_relocs)

arch/x86/Makefile.postlink

+1 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ __archpost: 


-include include/config/auto.conf

include $(srctree)/scripts/Kbuild.include

include $(srctree)/scripts/Makefile.lib



CMD_RELOCS = arch/x86/tools/relocs

OUT_RELOCS = arch/x86/boot/compressed
@@ -20,11 +21,6 @@ quiet_cmd_relocs = RELOCS $(OUT_RELOCS)/$@.relocs 
	$(CMD_RELOCS) $@ > $(OUT_RELOCS)/$@.relocs; \

	$(CMD_RELOCS) --abs-relocs $@



quiet_cmd_strip_relocs = RSTRIP  $@

      cmd_strip_relocs = \

	$(OBJCOPY) --remove-section='.rel.*' --remove-section='.rel__*' \

		   --remove-section='.rela.*' --remove-section='.rela__*' $@



# `@true` prevents complaint when there is nothing to be done



vmlinux: FORCE

scripts/Makefile.lib

+3 −0
Original line number Diff line number Diff line
@@ -374,6 +374,9 @@ quiet_cmd_ar = AR $@ 
quiet_cmd_objcopy = OBJCOPY $@

cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@



quiet_cmd_strip_relocs = RSTRIP  $@

cmd_strip_relocs = $(OBJCOPY) --remove-section='.rel*' $@



# Gzip

# ---------------------------------------------------------------------------