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

Commit b7787e66 authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm64: Cleanup __activate_traps and __deactive_traps for VHE and non-VHE 



To make the code more readable and to avoid the overhead of a function
call, let's get rid of a pair of the alternative function selectors and
explicitly call the VHE and non-VHE functions using the has_vhe() static
key based selector instead, telling the compiler to try to inline the
static function if it can.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a2465629

arch/arm64/kvm/hyp/switch.c

+10 −12
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void __hyp_text __deactivate_traps_common(void) 
	write_sysreg(0, pmuserenr_el0);

}



static void __hyp_text __activate_traps_vhe(struct kvm_vcpu *vcpu)

static void activate_traps_vhe(struct kvm_vcpu *vcpu)

{

	u64 val;
@@ -109,10 +109,6 @@ static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) 
	write_sysreg(val, cptr_el2);

}



static hyp_alternate_select(__activate_traps_arch,

			    __activate_traps_nvhe, __activate_traps_vhe,

			    ARM64_HAS_VIRT_HOST_EXTN);



static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)

{

	u64 hcr = vcpu->arch.hcr_el2;
@@ -123,10 +119,13 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu) 
		write_sysreg_s(vcpu->arch.vsesr_el2, SYS_VSESR_EL2);



	__activate_traps_fpsimd32(vcpu);

	__activate_traps_arch()(vcpu);

	if (has_vhe())

		activate_traps_vhe(vcpu);

	else

		__activate_traps_nvhe(vcpu);

}



static void __hyp_text __deactivate_traps_vhe(void)

static void deactivate_traps_vhe(void)

{

	extern char vectors[];	/* kernel exception vectors */

	write_sysreg(HCR_HOST_VHE_FLAGS, hcr_el2);
@@ -148,10 +147,6 @@ static void __hyp_text __deactivate_traps_nvhe(void) 
	write_sysreg(CPTR_EL2_DEFAULT, cptr_el2);

}



static hyp_alternate_select(__deactivate_traps_arch,

			    __deactivate_traps_nvhe, __deactivate_traps_vhe,

			    ARM64_HAS_VIRT_HOST_EXTN);



static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu)

{

	/*
@@ -163,7 +158,10 @@ static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.hcr_el2 & HCR_VSE)

		vcpu->arch.hcr_el2 = read_sysreg(hcr_el2);



	__deactivate_traps_arch()();

	if (has_vhe())

		deactivate_traps_vhe();

	else

		__deactivate_traps_nvhe();

}



void activate_traps_vhe_load(struct kvm_vcpu *vcpu)