arm64: Do not include __READ_ONCE() block in assembly files
Subsystems (2)
PATCH 1/1 arm64: Do not include __READ_ONCE() block in assembly files
When building arm64 defconfig + CONFIG_LTO_CLANG_{FULL,THIN}=y after commit 558c303c9734 ("arm64: Mitigate spectre style branch history side channels"), the following error occurs:
<instantiation>:4:2: error: invalid fixup for movz/movk instruction
mov w0, #ARM_SMCCC_ARCH_WORKAROUND_3
^
Marc figured out that moving "#include <linux/init.h>" in include/linux/arm-smccc.h into a !__ASSEMBLY__ block resolves it. The full include chain with CONFIG_LTO=y from include/linux/arm-smccc.h:
include/linux/init.hinclude/linux/compiler.harch/arm64/include/asm/rwonce.harch/arm64/include/asm/alternative-macros.harch/arm64/include/asm/assembler.h
The asm/alternative-macros.h include in asm/rwonce.h only happens when CONFIG_LTO is set, which ultimately casues asm/assembler.h to be included before the definition of ARM_SMCCC_ARCH_WORKAROUND_3. As a result, the preprocessor does not expand ARM_SMCCC_ARCH_WORKAROUND_3 in __mitigate_spectre_bhb_fw, which results in the error above.
Avoid this problem by just avoiding the CONFIG_LTO=y __READ_ONCE() block in asm/rwonce.h with assembly files, as nothing in that block is useful to assembly files, which allows ARM_SMCCC_ARCH_WORKAROUND_3 to be properly expanded with CONFIG_LTO=y builds.
---
This is based on current mainline; if it should be based on a specific arm64 branch, please let me know.
As 558c303c9734 is going to stable, I marked this for stable as well to avoid breaking Android. I used e35123d83ee3 for the fixes tag to make it clear to the stable team this should only go where that commit is present. If a different fixes tag should be used, please feel free to substitute.
arch/arm64/include/asm/rwonce.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/rwonce.h +2 -2
@@ -5,7 +5,7 @@#ifndef __ASM_RWONCE_H#define __ASM_RWONCE_H -#ifdef CONFIG_LTO +#if defined(CONFIG_LTO ) && !defined(__ASSEMBLY__)#include <linux/compiler_types.h> #include <asm/alternative-macros.h>
@@ -66,7 +66,7 @@ })#endif /* !BUILD_VDSO */ -#endif /* CONFIG_LTO */ +#endif /* CONFIG_LTO && !__ASSEMBLY__ */ #include <asm-generic/rwonce.h>
base-commit: 330f4c53d3c2d8b11d86ec03a964b86dc81452f5
Signature · 1 line
2.35.1
Quoted 30 lines · Nathan Chancellor
When building arm64 defconfig + CONFIG_LTO_CLANG_{FULL,THIN}=y after commit
558c303c9734("arm64: Mitigate spectre style branch history side channels"), the following error occurs:<instantiation>:4:2: error: invalid fixup for movz/movk instruction
mov w0, #ARM_SMCCC_ARCH_WORKAROUND_3
^Marc figured out that moving "#include <
linux/init.h>" ininclude/linux/arm-smccc.hinto a !__ASSEMBLY__ block resolves it. The full include chain withCONFIG_LTO=yfrominclude/linux/arm-smccc.h:
include/linux/init.hinclude/linux/compiler.harch/arm64/include/asm/rwonce.harch/arm64/include/asm/alternative-macros.harch/arm64/include/asm/assembler.hThe
asm/alternative-macros.hinclude inasm/rwonce.honly happens whenCONFIG_LTOis set, which ultimately casuesasm/assembler.hto be included before the definition ofARM_SMCCC_ARCH_WORKAROUND_3. As a result, the preprocessor does not expandARM_SMCCC_ARCH_WORKAROUND_3in__mitigate_spectre_bhb_fw, which results in the error above.Avoid this problem by just avoiding the
CONFIG_LTO=y__READ_ONCE()block inasm/rwonce.hwith assembly files, as nothing in that block is useful to assembly files, which allowsARM_SMCCC_ARCH_WORKAROUND_3to be properly expanded withCONFIG_LTO=ybuilds.
Quoted 6 lines
Fixes e35123d83ee3 ("arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y")Reported-by Marc Zyngier <[email protected]>Acked-by James Morse <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Thanks for taking point on all of the BHB fallout.
Quoted 41 lines
---
This is based on current mainline; if it should be based on a specific arm64 branch, please let me know.
As
558c303c9734is going to stable, I marked this for stable as well to avoid breaking Android. I usede35123d83ee3for the fixes tag to make it clear to the stable team this should only go where that commit is present. If a different fixes tag should be used, please feel free to substitute.arch/arm64/include/asm/rwonce.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm64/include/asm/rwonce.h +2
-2@@ -5,7 +5,7 @@#ifndef __ASM_RWONCE_H#define __ASM_RWONCE_H -#ifdef CONFIG_LTO +#if defined(CONFIG_LTO ) && !defined(__ASSEMBLY__)#include <linux/compiler_types.h> #include <asm/alternative-macros.h> @@ -66,7 +66,7 @@ })#endif /* !BUILD_VDSO */ -#endif /* CONFIG_LTO */ +#endif /* CONFIG_LTO && !__ASSEMBLY__ */ #include <asm-generic/rwonce.h> base-commit:
330f4c53d3c2d8b11d86ec03a964b86dc81452f5--
2.35.1
Signature · 2 lines
Thanks, ~Nick Desaulniers
Catalin Marinas
maintainerQuoted 13 lines · Nick Desaulniers
Quoted 11 lines · Nathan Chancellor
Avoid this problem by just avoiding the
CONFIG_LTO=y__READ_ONCE()block inasm/rwonce.hwith assembly files, as nothing in that block is useful to assembly files, which allowsARM_SMCCC_ARCH_WORKAROUND_3to be properly expanded withCONFIG_LTO=ybuilds.Fixes e35123d83ee3 ("arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y")Reported-by Marc Zyngier <[email protected]>Acked-by James Morse <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>
Quoted 4 lines
Thanks for taking point on all of the BHB fallout.
Reviewed-by Nick Desaulniers <[email protected]>Tested-by Nick Desaulniers <[email protected]>
Thanks for the review and testing. Unfortunately I've just sent the pull request to Linus, so didn't include your tags.
Signature · 1 line
Catalin
Quoted 9 lines · Nathan Chancellor
When building arm64 defconfig + CONFIG_LTO_CLANG_{FULL,THIN}=y after commit
558c303c9734("arm64: Mitigate spectre style branch history side channels"), the following error occurs:<instantiation>:4:2: error: invalid fixup for movz/movk instruction
mov w0, #ARM_SMCCC_ARCH_WORKAROUND_3
^[...]
Applied to arm64 (for-next/spectre-bhb), thanks!
[1/1] arm64: Do not include __READ_ONCE() block in assembly files
https://git.kernel.org/arm64/c/52c9f93a9c48
Signature · 1 line
Catalin