Commit 5359a87d authored by Will Deacon's avatar Will Deacon
Browse files

KVM: arm64: Replace CONFIG_KVM_INDIRECT_VECTORS with CONFIG_RANDOMIZE_BASE 



The removal of CONFIG_HARDEN_BRANCH_PREDICTOR means that
CONFIG_KVM_INDIRECT_VECTORS is synonymous with CONFIG_RANDOMIZE_BASE,
so replace it.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6e5f0927

arch/arm64/include/asm/kvm_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ DECLARE_KVM_HYP_SYM(__kvm_hyp_vector); 
#define __kvm_hyp_init		CHOOSE_NVHE_SYM(__kvm_hyp_init)

#define __kvm_hyp_vector	CHOOSE_HYP_SYM(__kvm_hyp_vector)



#ifdef CONFIG_KVM_INDIRECT_VECTORS

#ifdef CONFIG_RANDOMIZE_BASE

extern atomic_t arm64_el2_vector_last_slot;

DECLARE_KVM_HYP_SYM(__bp_harden_hyp_vecs);

#define __bp_harden_hyp_vecs	CHOOSE_HYP_SYM(__bp_harden_hyp_vecs)

arch/arm64/include/asm/kvm_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static inline int kvm_write_guest_lock(struct kvm *kvm, gpa_t gpa, 
	return ret;

}



#ifdef CONFIG_KVM_INDIRECT_VECTORS

#ifdef CONFIG_RANDOMIZE_BASE

/*

 * EL2 vectors can be mapped and rerouted in a number of ways,

 * depending on the kernel configuration and CPU present:

arch/arm64/kernel/cpu_errata.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ atomic_t arm64_el2_vector_last_slot = ATOMIC_INIT(-1); 


DEFINE_PER_CPU_READ_MOSTLY(struct bp_hardening_data, bp_hardening_data);



#ifdef CONFIG_KVM_INDIRECT_VECTORS

#ifdef CONFIG_RANDOMIZE_BASE

static void __copy_hyp_vect_bpi(int slot, const char *hyp_vecs_start,

				const char *hyp_vecs_end)

{
@@ -167,7 +167,7 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn, 
{

	__this_cpu_write(bp_hardening_data.fn, fn);

}

#endif	/* CONFIG_KVM_INDIRECT_VECTORS */

#endif	/* CONFIG_RANDOMIZE_BASE */



#include <linux/arm-smccc.h>

arch/arm64/kvm/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ config KVM_ARM_PMU 
	  Adds support for a virtual Performance Monitoring Unit (PMU) in

	  virtual machines.



config KVM_INDIRECT_VECTORS

	def_bool RANDOMIZE_BASE



endif # KVM



endif # VIRTUALIZATION

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ subdir-ccflags-y := -I$(incdir) \ 
		    $(DISABLE_STACKLEAK_PLUGIN)



obj-$(CONFIG_KVM) += vhe/ nvhe/

obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o
 
obj-$(CONFIG_RANDOMIZE_BASE) += smccc_wa.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE