mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-25 09:41:09 -04:00
4a44b17406
The Makefile version of rustc-option currently checks whether the option exists for the host target instead of the target actually being compiled for. It was done this way in commit46e24a545c("rust: kasan/kbuild: fix missing flags on first build") to avoid a circular dependency on target.json. However, because of this, rustc-option currently does not function when cross-compiling from x86_64 to aarch64 if CONFIG_SHADOW_CALL_STACK is enabled. This is because KBUILD_RUSTFLAGS contains -Zfixed-x18 under this configuration. Since that flag does not exist on the host target, rustc-option runs into a compilation failure every time, leading to all flags being rejected as unsupported. To fix this, update rustc-option to pass a --target parameter so that the host target is not used. For targets using target.json, use a built-in target that is as close as possible to the target created with target.json to avoid the circular dependency on target.json. One scenario where this causes a boot failure: * Cross-compiled from x86_64 to aarch64. * With CONFIG_SHADOW_CALL_STACK=y * With CONFIG_KASAN_SW_TAGS=y * With CONFIG_KASAN_INLINE=n Then the resulting kernel image will fail to boot when it first calls into Rust code with a crash along the lines of "Unable to handle kernel paging request at virtual address 0ffffffc08541796". This is because the call threshold is not specified, so rustc will inline kasan operations, but the kasan shadow offset is not specified, which leads to the inlined kasan instructions being incorrect. Note that the -Zsanitizer=kernel-hwaddress parameter itself does not lead to a rustc-option failure despite being aarch64-specific because RUSTFLAGS_KASAN has not yet been added to KBUILD_RUSTFLAGS when rustc-option is evaluated by the kasan Makefile. Cc: stable@vger.kernel.org Fixes:46e24a545c("rust: kasan/kbuild: fix missing flags on first build") Signed-off-by: Alice Ryhl <aliceryhl@google.com> Link: https://patch.msgid.link/20260507-rustc-option-cross-v2-1-2f650a49c2b5@google.com [ Edited slightly: - Reset variable to avoid using the environment. - Use a simply expanded variable flavor for simplicity. - Export variable so that behavior in sub-`make`s is consistent. This matches other variables. - Miguel ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
74 lines
2.0 KiB
Makefile
74 lines
2.0 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
core-y += arch/x86/crypto/
|
|
|
|
#
|
|
# Disable SSE and other FP/SIMD instructions to match normal x86
|
|
# This is required to work around issues in older LLVM versions, but breaks
|
|
# GCC versions < 11. See:
|
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99652
|
|
#
|
|
ifeq ($(call gcc-min-version, 110000)$(CONFIG_CC_IS_CLANG),y)
|
|
KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
|
|
KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
|
|
endif
|
|
|
|
KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
|
|
|
|
# The target.json file is not available when invoking rustc-option, so use the
|
|
# built-in target when checking whether flags are supported instead.
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
KBUILD_RUSTFLAGS_OPTION_CHKS += --target=i686-unknown-linux-gnu
|
|
else
|
|
KBUILD_RUSTFLAGS_OPTION_CHKS += --target=x86_64-unknown-linux-gnu
|
|
endif
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
START := 0x8048000
|
|
|
|
KBUILD_LDFLAGS += -m elf_i386
|
|
ELF_ARCH := i386
|
|
ELF_FORMAT := elf32-i386
|
|
CHECKFLAGS += -D__i386__
|
|
|
|
KBUILD_CFLAGS += $(call cc-option,-m32)
|
|
KBUILD_AFLAGS += $(call cc-option,-m32)
|
|
LINK-y += $(call cc-option,-m32)
|
|
|
|
LDS_EXTRA := -Ui386
|
|
export LDS_EXTRA
|
|
|
|
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
|
|
include $(srctree)/arch/x86/Makefile_32.cpu
|
|
|
|
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
|
|
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
|
|
|
|
# Prevent sprintf in nfsd from being converted to strcpy and resulting in
|
|
# an unresolved reference.
|
|
cflags-y += -ffreestanding
|
|
|
|
KBUILD_CFLAGS += $(cflags-y)
|
|
|
|
else
|
|
|
|
START := 0x60000000
|
|
|
|
KBUILD_CFLAGS += -fno-builtin -m64
|
|
|
|
CHECKFLAGS += -m64 -D__x86_64__
|
|
KBUILD_AFLAGS += -m64
|
|
KBUILD_LDFLAGS += -m elf_x86_64
|
|
KBUILD_CPPFLAGS += -m64
|
|
|
|
ELF_ARCH := i386:x86-64
|
|
ELF_FORMAT := elf64-x86-64
|
|
|
|
# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64
|
|
LINK-y += -m64
|
|
|
|
vdso-install-y += arch/x86/um/vdso/vdso.so.dbg
|
|
|
|
endif
|