Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (8530684f) · Commits · 戴 / test

Pull arm64 fixes from Will Deacon: "The big fix here is to our vDSO sigreturn trampoline as, after a painfully long stint of debugging, it turned out that fixing some of our CFI directives in the merge window lit up a bunch of logic in libgcc which has been shown to SEGV in some cases during asynchronous pthread cancellation. It looks like we can fix this by extending the directives to restore most of the interrupted register state from the sigcontext, but it's risky and hard to test so we opted to remove the CFI directives for now and rely on the unwinder fallback path like we used to. - Fix unwinding through vDSO sigreturn trampoline - Fix build warnings by raising minimum LD version for PAC - Whitelist some Kryo Cortex-A55 derivatives for Meltdown and SSB - Fix perf register PC reporting for compat tasks - Fix 'make clean' warning for arm64 signal selftests - Fix ftrace when BTI is compiled in - Avoid building the compat vDSO using GCC plugins" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Add KRYO{3,4}XX silver CPU cores to SSB safelist arm64: perf: Report the PC value in REGS_ABI_32 mode kselftest: arm64: Remove redundant clean target arm64: kpti: Add KRYO{3, 4}XX silver CPU cores to kpti safelist arm64: Don't insert a BTI instruction at inner labels arm64: vdso: Don't use gcc plugins for building vgettimeofday.c arm64: vdso: Only pass --no-eh-frame-hdr when linker supports it arm64: Depend on newer binutils when building PAC arm64: compat: Remove 32-bit sigreturn code from the vDSO arm64: compat: Always use sigpage for sigreturn trampoline arm64: compat: Allow 32-bit vdso and sigpage to co-exist arm64: vdso: Disable dwarf unwinding through the sigreturn trampoline

arch/arm64/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -1518,9 +1518,9 @@ config ARM64_PTR_AUTH
		default y
		depends on !KVM \|\| ARM64_VHE
		depends on (CC_HAS_SIGN_RETURN_ADDRESS \|\| CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC
		# GCC 9.1 and later inserts a .note.gnu.property section note for PAC
		# Modern compilers insert a .note.gnu.property section note for PAC
		# which is only understood by binutils starting with version 2.33.1.
		depends on !CC_IS_GCC \|\| GCC_VERSION < 90100 \|\| LD_VERSION >= 233010000
		depends on LD_IS_LLD \|\| LD_VERSION >= 233010000 \|\| (CC_IS_GCC && GCC_VERSION < 90100)
		depends on !CC_IS_CLANG \|\| AS_HAS_CFI_NEGATE_RA_STATE
		depends on (!FUNCTION_GRAPH_TRACER \|\| DYNAMIC_FTRACE_WITH_REGS)
		help

arch/arm64/include/asm/linkage.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@
		* instead.
		*/
		#define BTI_C hint 34 ;
		#define BTI_J hint 36 ;

		/*
		* When using in-kernel BTI we need to ensure that PCS-conformant assembly
		@@ -43,11 +42,6 @@
		SYM_START(name, SYM_L_WEAK, SYM_A_NONE) \
		BTI_C

		#define SYM_INNER_LABEL(name, linkage) \
		.type name SYM_T_NONE ASM_NL \
		SYM_ENTRY(name, linkage, SYM_A_NONE) \
		BTI_J

		#endif

		/*

arch/arm64/include/asm/mmu.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@

		typedef struct {
		atomic64_t id;
		#ifdef CONFIG_COMPAT
		void *sigpage;
		#endif
		void *vdso;
		unsigned long flags;
		} mm_context_t;

arch/arm64/kernel/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE

		obj-$(CONFIG_COMPAT) += sys32.o signal32.o \
		sys_compat.o
		ifneq ($(CONFIG_COMPAT_VDSO), y)
		obj-$(CONFIG_COMPAT) += sigreturn32.o
		endif
		obj-$(CONFIG_KUSER_HELPERS) += kuser32.o
		obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o
		obj-$(CONFIG_MODULES) += module.o

arch/arm64/kernel/cpu_errata.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -460,6 +460,8 @@ static const struct midr_range arm64_ssb_cpus[] = {
		MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),
		MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
		MIDR_ALL_VERSIONS(MIDR_BRAHMA_B53),
		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
		{},
		};

Admin message