Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa979fa8 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Replace hyp_alternate_select with has_vhe() 



Given that the TLB invalidation path is pretty rarely used, there
was never any advantage to using hyp_alternate_select() here.
has_vhe(), being a glorified static key, is the right tool for
the job.

Off you go.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
parent b6749e20

arch/arm64/kvm/hyp/tlb.c

+22 −14
Original line number Diff line number Diff line
@@ -67,10 +67,14 @@ static void __hyp_text __tlb_switch_to_guest_nvhe(struct kvm *kvm, 
	isb();

}



static hyp_alternate_select(__tlb_switch_to_guest,

			    __tlb_switch_to_guest_nvhe,

			    __tlb_switch_to_guest_vhe,

			    ARM64_HAS_VIRT_HOST_EXTN);

static void __hyp_text __tlb_switch_to_guest(struct kvm *kvm,

					     struct tlb_inv_context *cxt)

{

	if (has_vhe())

		__tlb_switch_to_guest_vhe(kvm, cxt);

	else

		__tlb_switch_to_guest_nvhe(kvm, cxt);

}



static void __hyp_text __tlb_switch_to_host_vhe(struct kvm *kvm,

						struct tlb_inv_context *cxt)
@@ -98,10 +102,14 @@ static void __hyp_text __tlb_switch_to_host_nvhe(struct kvm *kvm, 
	write_sysreg(0, vttbr_el2);

}



static hyp_alternate_select(__tlb_switch_to_host,

			    __tlb_switch_to_host_nvhe,

			    __tlb_switch_to_host_vhe,

			    ARM64_HAS_VIRT_HOST_EXTN);

static void __hyp_text __tlb_switch_to_host(struct kvm *kvm,

					    struct tlb_inv_context *cxt)

{

	if (has_vhe())

		__tlb_switch_to_host_vhe(kvm, cxt);

	else

		__tlb_switch_to_host_nvhe(kvm, cxt);

}



void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)

{
@@ -111,7 +119,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) 


	/* Switch to requested VMID */

	kvm = kern_hyp_va(kvm);

	__tlb_switch_to_guest()(kvm, &cxt);

	__tlb_switch_to_guest(kvm, &cxt);



	/*

	 * We could do so much better if we had the VA as well.
@@ -154,7 +162,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) 
	if (!has_vhe() && icache_is_vpipt())

		__flush_icache_all();



	__tlb_switch_to_host()(kvm, &cxt);

	__tlb_switch_to_host(kvm, &cxt);

}



void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm)
@@ -165,13 +173,13 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm) 


	/* Switch to requested VMID */

	kvm = kern_hyp_va(kvm);

	__tlb_switch_to_guest()(kvm, &cxt);

	__tlb_switch_to_guest(kvm, &cxt);



	__tlbi(vmalls12e1is);

	dsb(ish);

	isb();



	__tlb_switch_to_host()(kvm, &cxt);

	__tlb_switch_to_host(kvm, &cxt);

}



void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
@@ -180,13 +188,13 @@ void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu) 
	struct tlb_inv_context cxt;



	/* Switch to requested VMID */

	__tlb_switch_to_guest()(kvm, &cxt);

	__tlb_switch_to_guest(kvm, &cxt);



	__tlbi(vmalle1);

	dsb(nsh);

	isb();



	__tlb_switch_to_host()(kvm, &cxt);

	__tlb_switch_to_host(kvm, &cxt);

}



void __hyp_text __kvm_flush_vm_context(void)