Commit 8934c845 authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

KVM: arm64: Remove redundant Spectre-v2 code from kvm_map_vector() 



'__kvm_bp_vect_base' is only used when dealing with the hardened vectors
so remove the redundant assignments in kvm_map_vectors().

Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20201113113847.21619-2-will@kernel.org
parent f8394f23

arch/arm64/kvm/arm.c

+0 −5
Original line number Diff line number Diff line
@@ -1306,11 +1306,6 @@ static int kvm_map_vectors(void) 
	 * !SV2 +  HEL2 -> allocate one vector slot and use exec mapping

	 *  SV2 +  HEL2 -> use hardened vectors and use exec mapping

	 */

	if (cpus_have_const_cap(ARM64_SPECTRE_V2)) {

		__kvm_bp_vect_base = kvm_ksym_ref(__bp_harden_hyp_vecs);

		__kvm_bp_vect_base = kern_hyp_va(__kvm_bp_vect_base);

	}



	if (cpus_have_const_cap(ARM64_HARDEN_EL2_VECTORS)) {

		phys_addr_t vect_pa = __pa_symbol(__bp_harden_hyp_vecs);

		unsigned long size = __BP_HARDEN_HYP_VECS_SZ;