kbuild: Hoist '--orphan-handling' into Kconfig
Subsystems (5)
PATCH 1/2 kbuild: Hoist '--orphan-handling' into Kconfig
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into Kconfig and the main Makefile so that disabling it is simpler, as the warning will only be enabled in a couple places (main Makefile and a couple of compressed boot folders that blow away LDFLAGS_vmlinx) and making it conditional is easier due to Kconfig syntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it for CONFIG_LD_ORPHAN_WARN.
To keep the list of supported architectures the same, introduce CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.
--- Makefile | 6 ++++++ arch/Kconfig | 9 +++++++++ arch/arm/Kconfig | 1 + arch/arm/Makefile | 4 ---- arch/arm/boot/compressed/Makefile | 4 +++- arch/arm64/Kconfig | 1 + arch/arm64/Makefile | 4 ---- arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 1 - arch/x86/Kconfig | 1 + arch/x86/Makefile | 3 --- arch/x86/boot/compressed/Makefile | 4 +++- init/Kconfig | 3 +++ 13 files changed, 28 insertions(+), 14 deletions(-)
Makefile +6 -0
@@ -984,6 +984,12 @@ ifeq ($(CONFIG_RELR),y) LDFLAGS_vmlinux += --pack-dyn-relocs=relr endif +# We never want expected sections to be placed heuristically by the +# linker. All sections should be explicitly named in the linker script. +ifeq ($(CONFIG_LD_ORPHAN_WARN),y) +LDFLAGS_vmlinux += --orphan-handling=warn +endif + # Align the bit size of userspace programs with the kernel KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
arch/Kconfig +9 -0
@@ -1028,6 +1028,15 @@ config HAVE_STATIC_CALL_INLINE bool depends on HAVE_STATIC_CALL +config ARCH_WANT_LD_ORPHAN_WARN + bool + help + An arch should select this symbol once all linker sections are explicitly + included, size-asserted, or discarded in the linker scripts. This is + important because we never want expected sections to be placed heuristically + by the linker, since the locations of such sections can change between linker + versions. + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig"
arch/arm/Kconfig +1 -0
@@ -35,6 +35,7 @@ config ARM select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION + select ARCH_WANT_LD_ORPHAN_WARN select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select BUILDTIME_TABLE_SORT if MMU select CLONE_BACKWARDS
arch/arm/Makefile +0 -4
@@ -16,10 +16,6 @@ LDFLAGS_vmlinux += --be8 KBUILD_LDFLAGS_MODULE += --be8 endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) - GZFLAGS :=-9 #KBUILD_CFLAGS +=-pipe
arch/arm/boot/compressed/Makefile +3 -1
@@ -129,7 +129,9 @@ LDFLAGS_vmlinux += --no-undefined # Delete all temporary local symbols LDFLAGS_vmlinux += -X # Report orphan sections -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) +ifeq ($(CONFIG_LD_ORPHAN_WARN),y) +LDFLAGS_vmlinux += --orphan-handling=warn +endif # Next argument is a linker script LDFLAGS_vmlinux += -T
arch/arm64/Kconfig +1 -0
@@ -81,6 +81,7 @@ config ARM64 select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA select ARM_ARCH_TIMER
arch/arm64/Makefile +0 -4
@@ -28,10 +28,6 @@ LDFLAGS_vmlinux += --fix-cortex-a53-843419 endif endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) - ifeq ($(CONFIG_ARM64_USE_LSE_ATOMICS), y) ifneq ($(CONFIG_ARM64_LSE_ATOMICS), y) $(warning LSE atomics not supported by binutils)
arch/powerpc/Kconfig +1 -0
@@ -152,6 +152,7 @@ config PPC select ARCH_USE_QUEUED_SPINLOCKS if PPC_QUEUED_SPINLOCKS select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IRQS_OFF_ACTIVATE_MM + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF select BUILDTIME_TABLE_SORT
arch/powerpc/Makefile +0 -1
@@ -123,7 +123,6 @@ endif LDFLAGS_vmlinux-y := -Bstatic LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y) -LDFLAGS_vmlinux += $(call ld-option,--orphan-handling=warn) ifdef CONFIG_PPC64 ifeq ($(call cc-option-yn,-mcmodel=medium),y)
arch/x86/Kconfig +1 -0
@@ -100,6 +100,7 @@ config X86 select ARCH_WANT_DEFAULT_BPF_JIT if X86_64 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_HUGE_PMD_SHARE + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_THP_SWAP if X86_64 select BUILDTIME_TABLE_SORT select CLKEVT_I8253
arch/x86/Makefile +0 -3
@@ -209,9 +209,6 @@ ifdef CONFIG_X86_64 LDFLAGS_vmlinux += -z max-page-size=0x200000 endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) archscripts: scripts_basic $(Q)$(MAKE) $(build)=arch/x86/tools relocs
arch/x86/boot/compressed/Makefile +3 -1
@@ -61,7 +61,9 @@ KBUILD_LDFLAGS += $(call ld-option,--no-ld-generated-unwind-info) # Compressed kernel should be built as PIE since it may be loaded at any # address by the bootloader. LDFLAGS_vmlinux := -pie $(call ld-option, --no-dynamic-linker) -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) +ifeq ($(CONFIG_LD_ORPHAN_WARN),y) +LDFLAGS_vmlinux += --orphan-handling=warn +endif LDFLAGS_vmlinux += -T hostprogs := mkpiggy
init/Kconfig +3 -0
@@ -1348,6 +1348,9 @@ config LD_DEAD_CODE_DATA_ELIMINATION present. This option is not well tested yet, so use at your own risk. +config LD_ORPHAN_WARN + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + config SYSCTL bool
base-commit: f8394f232b1eab649ce2df5c5f15b0e528c92091
Signature · 1 line
2.29.2
PATCH 2/2 kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to LDFLAGS_vmlinux if ld.lld's version is not new enough.
--- MAINTAINERS | 1 + init/Kconfig | 6 +++++- scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 scripts/lld-version.sh
MAINTAINERS +1 -0
@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE API
init/Kconfig +5 -1
@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT
@@ -1349,7 +1353,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION own risk. config LD_ORPHAN_WARN - def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) && (!LD_IS_LLD || LLD_VERSION >= 110000) config SYSCTL bool
scripts/lld-version.sh new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# ld.lld-version ld.lld-command +# +# Print the linker version of `ld.lld-command' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker="$*" + +if ! ( $linker --version | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$($linker --version | cut -d ' ' -f 2) +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
Signature · 1 line
2.29.2
Re: [PATCH 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 61 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- MAINTAINERS | 1 + init/Kconfig | 6 +++++- scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 scripts/lld-version.shMAINTAINERS +1
-0@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE APIinit/Kconfig +5
-1@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT@@ -1349,7 +1353,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION own risk. config LD_ORPHAN_WARN - def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) && (!LD_IS_LLD || LLD_VERSION >= 110000) config SYSCTL boolscripts/lld-version.sh new file +0
-0
scripts/lld-version.sh line 4
Quoted 4 lines
scripts/lld-version.sh new file +4
-0@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# ld.lld-version ld.lld-command
^ it looks like this format was copied from scripts/gcc-version, but it's kind of curious/cryptic to me for a comment about usage. Is it necessary? A comment in the form:
# Usage: ./scripts/lld-version.sh ld.lld
Would be clearer to me.
scripts/lld-version.sh line 16
Quoted 12 lines
scripts/lld-version.sh new file +12
-0+# +# Print the linker version of `ld.lld-command' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker="$*" + +if ! ( $linker --version | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$($linker --version | cut -d ' ' -f 2)
This is going to invoke the linker potentially twice if it's LLD. Would it be nicer to capture the output of $linker --version, check which linker it is, then slice that up via cut to get the version?
This version is fine to me, but if you're going to send a v2, that might be a nice slight cleanup. Otherwise,
(Please drop those tags if you modify this for v2 and I'll rereview/retest).
Quoted 7 lines
scripts/lld-version.sh new file +4
-1+MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL --2.29.2
Signature · 2 lines
Thanks, ~Nick Desaulniers
Nathan Chancellor
Reviewed-by Kees CookRe: [PATCH 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 93 lines · Nick Desaulniers
Quoted 61 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- MAINTAINERS | 1 + init/Kconfig | 6 +++++- scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 scripts/lld-version.shMAINTAINERS +1
-0@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE APIinit/Kconfig +5
-1@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT@@ -1349,7 +1353,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION own risk. config LD_ORPHAN_WARN - def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) && (!LD_IS_LLD || LLD_VERSION >= 110000) config SYSCTL boolscripts/lld-version.sh new file +0
-0scripts/lld-version.sh line 4
Quoted 4 lines
scripts/lld-version.sh new file +4
-0@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# ld.lld-version ld.lld-command^ it looks like this format was copied from
scripts/gcc-version, but it's kind of curious/cryptic to me for a comment about usage. Is it necessary? A comment in the form:# Usage:
./scripts/lld-version.shld.lldWould be clearer to me.
scripts/lld-version.sh line 16
Quoted 12 lines
scripts/lld-version.sh new file +12
-0+# +# Print the linker version of `ld.lld-command' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker="$*" + +if ! ( $linker --version | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$($linker --version | cut -d ' ' -f 2)This is going to invoke the linker potentially twice if it's LLD. Would it be nicer to capture the output of
$linker --version, check which linker it is, then slice that up viacutto get the version?
Quoted 7 lines
This version is fine to me, but if you're going to send a v2, that might be a nice slight cleanup. Otherwise,
Reviewed-by Nick Desaulniers <[email protected]>Tested-by Nick Desaulniers <[email protected]>(Please drop those tags if you modify this for v2 and I'll rereview/retest).
Below is the impending v2 if you wanted to give it an early test, I plan to send it along formally Thursday morning with all of the addressed feedback so far.
Cheers,
Nathan
======================================================================
From 1ef9b12daf2b19ed6687423483d5bb1f5cf82e13 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <[email protected]>
Date: Tue, 17 Nov 2020 20:11:26 -0700
Subject: [PATCH] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to LDFLAGS_vmlinux if ld.lld's version is not new enough.
--- MAINTAINERS | 1 + init/Kconfig | 9 ++++++++- scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 scripts/lld-version.sh
MAINTAINERS +1 -0
@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE API
init/Kconfig +8 -1
@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT
@@ -1349,7 +1353,10 @@ config LD_DEAD_CODE_DATA_ELIMINATION own risk. config LD_ORPHAN_WARN - def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool y + depends on ARCH_WANT_LD_ORPHAN_WARN + depends on !LD_IS_LLD || LLD_VERSION >= 110000 + depends on $(ld-option,--orphan-handling=warn) config SYSCTL bool
scripts/lld-version.sh new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Usage: $ ./scripts/lld-version.sh ld.lld +# +# Print the linker version of `ld.lld' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker_string="$($* --version)" + +if ! ( echo $linker_string | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$(echo $linker_string | cut -d ' ' -f 2) +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
Signature · 1 line
2.29.2
Re: [PATCH 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
In reply to Nathan Chancellorinit/Kconfig config LD_DEAD_CODE_DATA_ELIMINATION · line 1356
Quoted 3 lines · Nathan Chancellor
config
LD_ORPHAN_WARNinit/Kconfig +1
-1- def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) && (!LD_IS_LLD || LLD_VERSION >= 110000)
Readability nit-pick... I prefer separate "depends" lines to make things a little easier to parse, change, etc:
config LD_ORPHAN_WARN
def_bool y depends on ARCH_WANT_LD_ORPHAN_WARN depends on !LD_IS_LLD || LLD_VERSION >= 110000 depends on $(ld-option,--orphan-handling=warn)
Otherwise, yeah, looks good to me. With this and the other suggestions, please consider it:
Signature · 1 line
Kees Cook
Re: [PATCH 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 14 lines · Kees Cook
init/Kconfig config LD_DEAD_CODE_DATA_ELIMINATION · line 1356
Quoted 3 lines · Nathan Chancellor
config
LD_ORPHAN_WARNinit/Kconfig +1
-1- def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) + def_bool ARCH_WANT_LD_ORPHAN_WARN && $(ld-option,--orphan-handling=warn) && (!LD_IS_LLD || LLD_VERSION >= 110000)Readability nit-pick... I prefer separate "depends" lines to make things a little easier to parse, change, etc:
config
LD_ORPHAN_WARNdef_bool y depends on ARCH_WANT_LD_ORPHAN_WARN depends on !LD_IS_LLD || LLD_VERSION >= 110000 depends on $(ld-option,--orphan-handling=warn)
Quoted 4 lines
Otherwise, yeah, looks good to me. With this and the other suggestions, please consider it:
Reviewed-by Kees Cook <[email protected]>
Thank you, I have updated it locally for v2!
Cheers,
Nathan
Quoted 5 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
Hi Nathan,
This patch fails to apply for me via b4 on next-20201116 due to a conflict in arch/Kconfig:1028. Would you mind sending a rebased V2?
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 11 lines · Nick Desaulniers
Quoted 5 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
Hi Nathan,
This patch fails to apply for me via b4 on next-20201116 due to a conflict inarch/Kconfig:1028. Would you mind sending a rebased V2?
Hi Nick,
This series is intended to go into v5.10 so rebasing it against -next defeats that; please test it against v5.10-rc4, where it still applies cleanly. The conflicts will be handled by other entities (Stephen Rothwell and Linus).
If you want to test it against -next, 'git am -3' will allow you to easily handle the conflict.
Cheers,
Nathan
Quoted 14 lines · Nathan Chancellor
Quoted 11 lines · Nick Desaulniers
Quoted 5 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
Hi Nathan,
This patch fails to apply for me via b4 on next-20201116 due to a conflict inarch/Kconfig:1028. Would you mind sending a rebased V2?
Quoted 6 lines
Hi Nick,
This series is intended to go into v5.10 so rebasing it against -next defeats that; please test it against v5.10-rc4, where it still applies cleanly. The conflicts will be handled by other entities (Stephen Rothwell and Linus).
Got it. Yeah, applies fine to v5.10-rc4.
Feel free to carry those with MPE's suggested change added.
Quoted 6 lines
If you want to test it against -next, 'git am -3' will allow you to easily handle the conflict.
Cheers,
Nathan
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 21 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into
Kconfigand the mainMakefileso that disabling it is simpler, as the warning will only be enabled in a couple places (mainMakefileand a couple of compressed boot folders that blow awayLDFLAGS_vmlinx) and making it conditional is easier due toKconfigsyntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it forCONFIG_LD_ORPHAN_WARN.To keep the list of supported architectures the same, introduce
CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.
Quoted 10 lines
--- Makefile | 6 ++++++ arch/Kconfig | 9 +++++++++ arch/arm/Kconfig | 1 + arch/arm/Makefile | 4 ---- arch/arm/boot/compressed/Makefile | 4 +++- arch/arm64/Kconfig | 1 + arch/arm64/Makefile | 4 ---- arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 1 -
Quoted 11 lines
arch/x86/Kconfig | 1 + arch/x86/Makefile | 3 --- arch/x86/boot/compressed/Makefile | 4 +++- init/Kconfig | 3 +++ 13 files changed, 28 insertions(+), 14 deletions(-)Makefile +0
-0
Makefile ifeq ($(CONFIG_RELR),y) · line 991
Quoted 8 lines
Makefile +5
-0@@ -984,6 +984,12 @@ ifeq ($(CONFIG_RELR),y) LDFLAGS_vmlinux += --pack-dyn-relocs=relr endif +# We never want expected sections to be placed heuristically by the +# linker. All sections should be explicitly named in the linker script. +ifeq ($(CONFIG_LD_ORPHAN_WARN),y) +LDFLAGS_vmlinux += --orphan-handling=warn +endif
This is a nit, but you can use ifdef with bool CONFIG symbols in Makefiles, which reads a bit nicer, eg:
ifdef CONFIG_LD_ORPHAN_WARNLDFLAGS_vmlinux += --orphan-handling=warn
endif
cheers
Quoted 59 lines · Michael Ellerman
Quoted 21 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into
Kconfigand the mainMakefileso that disabling it is simpler, as the warning will only be enabled in a couple places (mainMakefileand a couple of compressed boot folders that blow awayLDFLAGS_vmlinx) and making it conditional is easier due toKconfigsyntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it forCONFIG_LD_ORPHAN_WARN.To keep the list of supported architectures the same, introduce
CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.Quoted 10 lines
--- Makefile | 6 ++++++ arch/Kconfig | 9 +++++++++ arch/arm/Kconfig | 1 + arch/arm/Makefile | 4 ---- arch/arm/boot/compressed/Makefile | 4 +++- arch/arm64/Kconfig | 1 + arch/arm64/Makefile | 4 ---- arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 1 -Quoted 11 lines
arch/x86/Kconfig | 1 + arch/x86/Makefile | 3 --- arch/x86/boot/compressed/Makefile | 4 +++- init/Kconfig | 3 +++ 13 files changed, 28 insertions(+), 14 deletions(-)Makefile +0
-0Makefile ifeq ($(CONFIG_RELR),y) · line 991
Quoted 8 lines
Makefile +5
-0@@ -984,6 +984,12 @@ ifeq ($(CONFIG_RELR),y) LDFLAGS_vmlinux += --pack-dyn-relocs=relr endif +# We never want expected sections to be placed heuristically by the +# linker. All sections should be explicitly named in the linker script. +ifeq ($(CONFIG_LD_ORPHAN_WARN),y) +LDFLAGS_vmlinux += --orphan-handling=warn +endifThis is a nit, but you can use ifdef with bool CONFIG symbols in Makefiles, which reads a bit nicer, eg:
Quoted 3 lines
ifdef
CONFIG_LD_ORPHAN_WARNLDFLAGS_vmlinux+= --orphan-handling=warn
endif
That is indeed cleaner, I did not realize I could do that as long as the config was a boolean. I will use that in v2, which I will send along within the next few days to give Masahiro some time to comment.
Cheers,
Nathan
Quoted 13 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into
Kconfigand the mainMakefileso that disabling it is simpler, as the warning will only be enabled in a couple places (mainMakefileand a couple of compressed boot folders that blow awayLDFLAGS_vmlinx) and making it conditional is easier due toKconfigsyntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it forCONFIG_LD_ORPHAN_WARN.
Quoted 8 lines
To keep the list of supported architectures the same, introduce
CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.
Looks good to me. With the other suggestions from the thread added, please consider it:
Signature · 1 line
Kees Cook
PATCH v2 1/2 kbuild: Hoist '--orphan-handling' into Kconfig
In reply to Nathan ChancellorCurrently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into Kconfig and the main Makefile so that disabling it is simpler, as the warning will only be enabled in a couple places (main Makefile and a couple of compressed boot folders that blow away LDFLAGS_vmlinx) and making it conditional is easier due to Kconfig syntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it for CONFIG_LD_ORPHAN_WARN.
To keep the list of supported architectures the same, introduce CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.
---
v1 -> v2:
* Change
ifeq ($(CONFIG_LD_ORPHAN_WARN),y)
to
ifdef CONFIG_LD_ORPHAN_WARN
to improve readability (Michael Ellerman)
* Separate conditions for CONFIG_LD_ORPHAN warn to improve readability (Kees Cook)
* Pick up tags from Kees, Michael, and Nick
Makefile | 6 ++++++ arch/Kconfig | 9 +++++++++ arch/arm/Kconfig | 1 + arch/arm/Makefile | 4 ---- arch/arm/boot/compressed/Makefile | 4 +++- arch/arm64/Kconfig | 1 + arch/arm64/Makefile | 4 ---- arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 1 - arch/x86/Kconfig | 1 + arch/x86/Makefile | 3 --- arch/x86/boot/compressed/Makefile | 4 +++- init/Kconfig | 5 +++++ 13 files changed, 30 insertions(+), 14 deletions(-)
Makefile +6 -0
@@ -984,6 +984,12 @@ ifeq ($(CONFIG_RELR),y) LDFLAGS_vmlinux += --pack-dyn-relocs=relr endif +# We never want expected sections to be placed heuristically by the +# linker. All sections should be explicitly named in the linker script. +ifdef CONFIG_LD_ORPHAN_WARN +LDFLAGS_vmlinux += --orphan-handling=warn +endif + # Align the bit size of userspace programs with the kernel KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
arch/Kconfig +9 -0
@@ -1028,6 +1028,15 @@ config HAVE_STATIC_CALL_INLINE bool depends on HAVE_STATIC_CALL +config ARCH_WANT_LD_ORPHAN_WARN + bool + help + An arch should select this symbol once all linker sections are explicitly + included, size-asserted, or discarded in the linker scripts. This is + important because we never want expected sections to be placed heuristically + by the linker, since the locations of such sections can change between linker + versions. + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig"
arch/arm/Kconfig +1 -0
@@ -35,6 +35,7 @@ config ARM select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION + select ARCH_WANT_LD_ORPHAN_WARN select BINFMT_FLAT_ARGVP_ENVP_ON_STACK select BUILDTIME_TABLE_SORT if MMU select CLONE_BACKWARDS
arch/arm/Makefile +0 -4
@@ -16,10 +16,6 @@ LDFLAGS_vmlinux += --be8 KBUILD_LDFLAGS_MODULE += --be8 endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) - GZFLAGS :=-9 #KBUILD_CFLAGS +=-pipe
arch/arm/boot/compressed/Makefile +3 -1
@@ -129,7 +129,9 @@ LDFLAGS_vmlinux += --no-undefined # Delete all temporary local symbols LDFLAGS_vmlinux += -X # Report orphan sections -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) +ifdef CONFIG_LD_ORPHAN_WARN +LDFLAGS_vmlinux += --orphan-handling=warn +endif # Next argument is a linker script LDFLAGS_vmlinux += -T
arch/arm64/Kconfig +1 -0
@@ -81,6 +81,7 @@ config ARM64 select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA select ARM_ARCH_TIMER
arch/arm64/Makefile +0 -4
@@ -28,10 +28,6 @@ LDFLAGS_vmlinux += --fix-cortex-a53-843419 endif endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) - ifeq ($(CONFIG_ARM64_USE_LSE_ATOMICS), y) ifneq ($(CONFIG_ARM64_LSE_ATOMICS), y) $(warning LSE atomics not supported by binutils)
arch/powerpc/Kconfig +1 -0
@@ -152,6 +152,7 @@ config PPC select ARCH_USE_QUEUED_SPINLOCKS if PPC_QUEUED_SPINLOCKS select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IRQS_OFF_ACTIVATE_MM + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF select BUILDTIME_TABLE_SORT
arch/powerpc/Makefile +0 -1
@@ -123,7 +123,6 @@ endif LDFLAGS_vmlinux-y := -Bstatic LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y) -LDFLAGS_vmlinux += $(call ld-option,--orphan-handling=warn) ifdef CONFIG_PPC64 ifeq ($(call cc-option-yn,-mcmodel=medium),y)
arch/x86/Kconfig +1 -0
@@ -100,6 +100,7 @@ config X86 select ARCH_WANT_DEFAULT_BPF_JIT if X86_64 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_HUGE_PMD_SHARE + select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_THP_SWAP if X86_64 select BUILDTIME_TABLE_SORT select CLKEVT_I8253
arch/x86/Makefile +0 -3
@@ -209,9 +209,6 @@ ifdef CONFIG_X86_64 LDFLAGS_vmlinux += -z max-page-size=0x200000 endif -# We never want expected sections to be placed heuristically by the -# linker. All sections should be explicitly named in the linker script. -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) archscripts: scripts_basic $(Q)$(MAKE) $(build)=arch/x86/tools relocs
arch/x86/boot/compressed/Makefile +3 -1
@@ -61,7 +61,9 @@ KBUILD_LDFLAGS += $(call ld-option,--no-ld-generated-unwind-info) # Compressed kernel should be built as PIE since it may be loaded at any # address by the bootloader. LDFLAGS_vmlinux := -pie $(call ld-option, --no-dynamic-linker) -LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) +ifdef CONFIG_LD_ORPHAN_WARN +LDFLAGS_vmlinux += --orphan-handling=warn +endif LDFLAGS_vmlinux += -T hostprogs := mkpiggy
init/Kconfig +5 -0
@@ -1348,6 +1348,11 @@ config LD_DEAD_CODE_DATA_ELIMINATION present. This option is not well tested yet, so use at your own risk. +config LD_ORPHAN_WARN + def_bool y + depends on ARCH_WANT_LD_ORPHAN_WARN + depends on $(ld-option,--orphan-handling=warn) + config SYSCTL bool
base-commit: 09162bc32c880a791c6c0668ce0745cf7958f576
Signature · 1 line
2.29.2
Quoted 19 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into
Kconfigand the mainMakefileso that disabling it is simpler, as the warning will only be enabled in a couple places (mainMakefileand a couple of compressed boot folders that blow awayLDFLAGS_vmlinx) and making it conditional is easier due toKconfigsyntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it forCONFIG_LD_ORPHAN_WARN.To keep the list of supported architectures the same, introduce
CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.
Quoted 6 lines
Acked-by Kees Cook <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Tested-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Masahiro, do you want to take these to get them to Linus for v5.10? I can send them if you'd prefer.
-Kees
Signature · 1 line
Kees Cook
Quoted 28 lines · Kees Cook
Quoted 19 lines · Nathan Chancellor
Currently, '--orphan-handling=warn' is spread out across four different architectures in their respective Makefiles, which makes it a little unruly to deal with in case it needs to be disabled for a specific linker version (in this case, ld.lld 10.0.1).
To make it easier to control this, hoist this warning into
Kconfigand the mainMakefileso that disabling it is simpler, as the warning will only be enabled in a couple places (mainMakefileand a couple of compressed boot folders that blow awayLDFLAGS_vmlinx) and making it conditional is easier due toKconfigsyntax. One small additional benefit of this is saving a call to ld-option on incremental builds because we will have already evaluated it forCONFIG_LD_ORPHAN_WARN.To keep the list of supported architectures the same, introduce
CONFIG_ARCH_WANT_LD_ORPHAN_WARN, which an architecture can select to gain this automatically after all of the sections are specified and size asserted. A special thanks to Kees Cook for the help text on this config.Quoted 6 lines
Acked-by Kees Cook <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Tested-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Quoted 3 lines
Masahiro, do you want to take these to get them to Linus for v5.10? I can send them if you'd prefer.
Sorry for the delay.
Applied to linux-kbuild.
Quoted 9 lines
-Kees
--
Kees Cook--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/202011201607.75FA476%40keescook.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 2/2 kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
In reply to Nathan Chancellorld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to LDFLAGS_vmlinux if ld.lld's version is not new enough.
---
v1 -> v2:
* Add condition as a depends on line (Kees Cook)
* Capture output of "$* --version" to avoid invoking linker twice (Nick Desaulniers)
* Improve documentation of script in comments (Nick Desaulniers)
* Pick up review tag from Kees
MAINTAINERS | 1 + init/Kconfig | 5 +++++ scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100755 scripts/lld-version.sh
MAINTAINERS +1 -0
@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE API
init/Kconfig +5 -0
@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT
@@ -1351,6 +1355,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION config LD_ORPHAN_WARN def_bool y depends on ARCH_WANT_LD_ORPHAN_WARN + depends on !LD_IS_LLD || LLD_VERSION >= 110000 depends on $(ld-option,--orphan-handling=warn) config SYSCTL
scripts/lld-version.sh new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Usage: $ ./scripts/lld-version.sh ld.lld +# +# Print the linker version of `ld.lld' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker_string="$($* --version)" + +if ! ( echo $linker_string | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$(echo $linker_string | cut -d ' ' -f 2) +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
Signature · 1 line
2.29.2
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.
Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Thanks for the additions in v2.
Quoted 83 lines
---
v1 -> v2:
* Add condition as a depends on line (Kees Cook)
* Capture output of "$* --version" to avoid invoking linker twice (Nick Desaulniers)
* Improve documentation of script in comments (Nick Desaulniers)
* Pick up review tag from Kees
MAINTAINERS | 1 + init/Kconfig | 5 +++++ scripts/lld-version.sh | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100755 scripts/lld-version.shMAINTAINERS +1
-0@@ -4284,6 +4284,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux F: Documentation/kbuild/llvm.rst F: scripts/clang-tools/ +F: scripts/lld-version.sh K: \b(?i:clang|llvm)\b CLEANCACHE APIinit/Kconfig +5
-0@@ -47,6 +47,10 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) +config LLD_VERSION + int + default $(shell,$(srctree)/scripts/lld-version.sh $(LD)) + config CC_CAN_LINK bool default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT@@ -1351,6 +1355,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION config LD_ORPHAN_WARN def_bool y depends on ARCH_WANT_LD_ORPHAN_WARN + depends on !LD_IS_LLD || LLD_VERSION >= 110000 depends on $(ld-option,--orphan-handling=warn) config SYSCTLscripts/lld-version.sh new file +20
-1@@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Usage: $ ./scripts/lld-version.sh ld.lld +# +# Print the linker version of `ld.lld' in a 5 or 6-digit form +# such as `100001' for ld.lld 10.0.1 etc. + +linker_string="$($* --version)" + +if ! ( echo $linker_string | grep -q LLD ); then + echo 0 + exit 1 +fi + +VERSION=$(echo $linker_string | cut -d ' ' -f 2) +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL --2.29.2
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 16 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Quoted 2 lines
Thanks for the additions in v2.
Reviewed-by Nick Desaulniers <[email protected]>
I'm going to carry this for a few days in -next, and if no one screams, ask Linus to pull it for v5.10-rc6.
Thanks!
Signature · 1 line
Kees Cook
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 21 lines · Kees Cook
Quoted 16 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>Quoted 2 lines
Thanks for the additions in v2.
Reviewed-by Nick Desaulniers <[email protected]>
Quoted 7 lines
I'm going to carry this for a few days in -next, and if no one screams, ask Linus to pull it for v5.10-rc6.
Thanks!
--
Kees Cook
Sorry for the delay.
Applied to linux-kbuild.
But, I already see this in linux-next.
Please let me know if I should drop it from my tree.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 25 lines · Masahiro Yamada
Quoted 24 lines · Kees Cook
Quoted 16 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>Quoted 2 lines
Thanks for the additions in v2.
Reviewed-by Nick Desaulniers <[email protected]>I'm going to carry this for a few days in -next, and if no one screams, ask Linus to pull it for v5.10-rc6.
Quoted 8 lines
Quoted 4 lines
Thanks!
--
Kees CookSorry for the delay.
Applied to linux-kbuild.
Great, thanks!
Quoted 2 lines
But, I already see this in linux-next. Please let me know if I should drop it from my tree.
My intention was to get this to Linus this week. Do you want to do that yourself, or Ack the patches in my tree and I'll send it?
-Kees
Signature · 1 line
Kees Cook
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 41 lines · Kees Cook
Quoted 25 lines · Masahiro Yamada
Quoted 24 lines · Kees Cook
Quoted 16 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>Quoted 2 lines
Thanks for the additions in v2.
Reviewed-by Nick Desaulniers <[email protected]>I'm going to carry this for a few days in -next, and if no one screams, ask Linus to pull it for v5.10-rc6.
Quoted 8 lines
Quoted 4 lines
Thanks!
--
Kees CookSorry for the delay.
Applied to linux-kbuild.Great, thanks!
Quoted 2 lines
But, I already see this in linux-next. Please let me know if I should drop it from my tree.
Quoted 7 lines
My intention was to get this to Linus this week. Do you want to do that yourself, or Ack the patches in my tree and I'll send it?
-Kees
--
Kees Cook
I will send a kbuild pull request myself this week.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH v2 2/2] kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1
Quoted 39 lines · Masahiro Yamada
Quoted 38 lines · Kees Cook
Quoted 25 lines · Masahiro Yamada
Quoted 24 lines · Kees Cook
Quoted 16 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
ld.lld 10.0.1 spews a bunch of various warnings about .rela sections, along with a few others. Newer versions of ld.lld do not have these warnings. As a result, do not add '--orphan-handling=warn' to
LDFLAGS_vmlinuxif ld.lld's version is not new enough.Quoted 7 lines
Reported-by Arvind Sankar <[email protected]>Reported-by kernelci.org bot <[email protected]>Reported-by Mark Brown <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>Quoted 2 lines
Thanks for the additions in v2.
Reviewed-by Nick Desaulniers <[email protected]>I'm going to carry this for a few days in -next, and if no one screams, ask Linus to pull it for v5.10-rc6.
Quoted 8 lines
Quoted 4 lines
Thanks!
--
Kees CookSorry for the delay.
Applied to linux-kbuild.Great, thanks!
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
But, I already see this in linux-next. Please let me know if I should drop it from my tree.
My intention was to get this to Linus this week. Do you want to do that yourself, or Ack the patches in my tree and I'll send it?
I will send a kbuild pull request myself this week.
Okay, thanks! I've removed it from my -next tree now.
Signature · 1 line
Kees Cook