Commit 96d454cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Fix kernel build with the integrated LLVM assembler which doesn't see
   the -Wa,-march option.

 - Fix "make vdso_install" when COMPAT_VDSO is disabled.

 - Make KVM more robust if the AT S1E1R instruction triggers an
   exception (architecture corner cases).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception
  KVM: arm64: Survive synchronous exceptions caused by AT instructions
  KVM: arm64: Add kvm_extable for vaxorcism code
  arm64: vdso32: make vdso32 install conditional
  arm64: use a common .arch preamble for inline assembly
parents ef91bb19 71a7f8cb

arch/arm64/Makefile

+10 −4
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ endif 
# compiler to generate them and consequently to break the single image contract

# we pass it only to the assembler. This option is utilized only in case of non

# integrated assemblers.

ifneq ($(CONFIG_AS_HAS_ARMV8_4), y)

branch-prot-flags-$(CONFIG_AS_HAS_PAC) += -Wa,-march=armv8.3-a

ifeq ($(CONFIG_AS_HAS_PAC), y)

asm-arch := armv8.3-a

endif

endif
@@ -91,7 +91,12 @@ KBUILD_CFLAGS += $(branch-prot-flags-y) 


ifeq ($(CONFIG_AS_HAS_ARMV8_4), y)

# make sure to pass the newest target architecture to -march.

KBUILD_CFLAGS	+= -Wa,-march=armv8.4-a

asm-arch := armv8.4-a

endif



ifdef asm-arch

KBUILD_CFLAGS	+= -Wa,-march=$(asm-arch) \

		   -DARM64_ASM_ARCH='"$(asm-arch)"'

endif



ifeq ($(CONFIG_SHADOW_CALL_STACK), y)
@@ -165,7 +170,8 @@ zinstall install: 
PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@

	$(if $(CONFIG_COMPAT_VDSO), \

		$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@)



# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

arch/arm64/include/asm/compiler.h

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ 
#ifndef __ASM_COMPILER_H

#define __ASM_COMPILER_H



#ifdef ARM64_ASM_ARCH

#define ARM64_ASM_PREAMBLE ".arch " ARM64_ASM_ARCH "\n"

#else

#define ARM64_ASM_PREAMBLE

#endif



/*

 * The EL0/EL1 pointer bits used by a pointer authentication code.

 * This is dependent on TBI0/TBI1 being enabled, or bits 63:56 would also apply.

arch/arm64/include/asm/kvm_arm.h

+2 −1
Original line number Diff line number Diff line
@@ -71,11 +71,12 @@ 
 * IMO:		Override CPSR.I and enable signaling with VI

 * FMO:		Override CPSR.F and enable signaling with VF

 * SWIO:	Turn set/way invalidates into set/way clean+invalidate

 * PTW:		Take a stage2 fault if a stage1 walk steps in device memory

 */

#define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \

			 HCR_BSU_IS | HCR_FB | HCR_TAC | \

			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \

			 HCR_FMO | HCR_IMO)

			 HCR_FMO | HCR_IMO | HCR_PTW )

#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)

#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK)

#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)

arch/arm64/include/asm/kvm_asm.h

+43 −0
Original line number Diff line number Diff line
@@ -169,6 +169,34 @@ extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ]; 
		*__hyp_this_cpu_ptr(sym);				\

	 })



#define __KVM_EXTABLE(from, to)						\

	"	.pushsection	__kvm_ex_table, \"a\"\n"		\

	"	.align		3\n"					\

	"	.long		(" #from " - .), (" #to " - .)\n"	\

	"	.popsection\n"





#define __kvm_at(at_op, addr)						\

( { 									\

	int __kvm_at_err = 0;						\

	u64 spsr, elr;							\

	asm volatile(							\

	"	mrs	%1, spsr_el2\n"					\

	"	mrs	%2, elr_el2\n"					\

	"1:	at	"at_op", %3\n"					\

	"	isb\n"							\

	"	b	9f\n"						\

	"2:	msr	spsr_el2, %1\n"					\

	"	msr	elr_el2, %2\n"					\

	"	mov	%w0, %4\n"					\

	"9:\n"								\

	__KVM_EXTABLE(1b, 2b)						\

	: "+r" (__kvm_at_err), "=&r" (spsr), "=&r" (elr)		\

	: "r" (addr), "i" (-EFAULT));					\

	__kvm_at_err;							\

} )





#else /* __ASSEMBLY__ */



.macro hyp_adr_this_cpu reg, sym, tmp
@@ -193,6 +221,21 @@ extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ]; 
	ldr	\vcpu, [\ctxt, #HOST_CONTEXT_VCPU]

.endm



/*

 * KVM extable for unexpected exceptions.

 * In the same format _asm_extable, but output to a different section so that

 * it can be mapped to EL2. The KVM version is not sorted. The caller must

 * ensure:

 * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented

 * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup.

 */

.macro	_kvm_extable, from, to

	.pushsection	__kvm_ex_table, "a"

	.align		3

	.long		(\from - .), (\to - .)

	.popsection

.endm



#endif



#endif /* __ARM_KVM_ASM_H__ */

arch/arm64/include/asm/tlbflush.h

+4 −2
Original line number Diff line number Diff line
@@ -28,14 +28,16 @@ 
 * not. The macros handles invoking the asm with or without the

 * register argument as appropriate.

 */

#define __TLBI_0(op, arg) asm ("tlbi " #op "\n"				       \

#define __TLBI_0(op, arg) asm (ARM64_ASM_PREAMBLE			       \

			       "tlbi " #op "\n"				       \

		   ALTERNATIVE("nop\n			nop",		       \

			       "dsb ish\n		tlbi " #op,	       \

			       ARM64_WORKAROUND_REPEAT_TLBI,		       \

			       CONFIG_ARM64_WORKAROUND_REPEAT_TLBI)	       \

			    : : )



#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0\n"			       \

#define __TLBI_1(op, arg) asm (ARM64_ASM_PREAMBLE			       \

			       "tlbi " #op ", %0\n"			       \

		   ALTERNATIVE("nop\n			nop",		       \

			       "dsb ish\n		tlbi " #op ", %0",     \

			       ARM64_WORKAROUND_REPEAT_TLBI,		       \

CRA Git | Maintained and supported by SUSTech CRA and CCSE