Commit 27cde4c0 authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: Rename helpers for VHE vCPU load/put 

The names for the helpers we expose to the 'generic' KVM code are a bit
imprecise; we switch the EL0 + EL1 sysreg context and setup trap
controls that do not need to change for every guest entry/exit. Rename +
shuffle things around a bit in preparation for loading the stage-2 MMU
context on vcpu_load().

Link: https://lore.kernel.org/r/20231018233212.2888027-5-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 5eba523e

arch/arm64/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -1109,8 +1109,8 @@ static inline bool kvm_set_pmuserenr(u64 val) 
}

#endif



void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_sysregs_vhe(struct kvm_vcpu *vcpu);

void kvm_vcpu_load_vhe(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_vhe(struct kvm_vcpu *vcpu);



int __init kvm_set_ipa_limit(void);

arch/arm64/include/asm/kvm_hyp.h

+2 −5
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ void __timer_disable_traps(struct kvm_vcpu *vcpu); 
void __sysreg_save_state_nvhe(struct kvm_cpu_context *ctxt);

void __sysreg_restore_state_nvhe(struct kvm_cpu_context *ctxt);

#else

void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu);

void __vcpu_put_switch_sysregs(struct kvm_vcpu *vcpu);

void sysreg_save_host_state_vhe(struct kvm_cpu_context *ctxt);

void sysreg_restore_host_state_vhe(struct kvm_cpu_context *ctxt);

void sysreg_save_guest_state_vhe(struct kvm_cpu_context *ctxt);
@@ -111,11 +113,6 @@ void __fpsimd_save_state(struct user_fpsimd_state *fp_regs); 
void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);

void __sve_restore_state(void *sve_pffr, u32 *fpsr);



#ifndef __KVM_NVHE_HYPERVISOR__

void activate_traps_vhe_load(struct kvm_vcpu *vcpu);

void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu);

#endif



u64 __guest_enter(struct kvm_vcpu *vcpu);



bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);

arch/arm64/kvm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
	kvm_vgic_load(vcpu);

	kvm_timer_vcpu_load(vcpu);

	if (has_vhe())

		kvm_vcpu_load_sysregs_vhe(vcpu);

		kvm_vcpu_load_vhe(vcpu);

	kvm_arch_vcpu_load_fp(vcpu);

	kvm_vcpu_pmu_restore_guest(vcpu);

	if (kvm_arm_is_pvtime_enabled(&vcpu->arch))
@@ -472,7 +472,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
	kvm_arch_vcpu_put_debug_state_flags(vcpu);

	kvm_arch_vcpu_put_fp(vcpu);

	if (has_vhe())

		kvm_vcpu_put_sysregs_vhe(vcpu);

		kvm_vcpu_put_vhe(vcpu);

	kvm_timer_vcpu_put(vcpu);

	kvm_vgic_put(vcpu);

	kvm_vcpu_pmu_restore_host(vcpu);

arch/arm64/kvm/hyp/vhe/switch.c

+15 −3
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu) 
NOKPROBE_SYMBOL(__deactivate_traps);



/*

 * Disable IRQs in {activate,deactivate}_traps_vhe_{load,put}() to

 * Disable IRQs in __vcpu_{load,put}_{activate,deactivate}_traps() to

 * prevent a race condition between context switching of PMUSERENR_EL0

 * in __{activate,deactivate}_traps_common() and IPIs that attempts to

 * update PMUSERENR_EL0. See also kvm_set_pmuserenr().

 */

void activate_traps_vhe_load(struct kvm_vcpu *vcpu)

static void __vcpu_load_activate_traps(struct kvm_vcpu *vcpu)

{

	unsigned long flags;
@@ -107,7 +107,7 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) 
	local_irq_restore(flags);

}



void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu)

static void __vcpu_put_deactivate_traps(struct kvm_vcpu *vcpu)

{

	unsigned long flags;
@@ -116,6 +116,18 @@ void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu) 
	local_irq_restore(flags);

}



void kvm_vcpu_load_vhe(struct kvm_vcpu *vcpu)

{

	__vcpu_load_switch_sysregs(vcpu);

	__vcpu_load_activate_traps(vcpu);

}



void kvm_vcpu_put_vhe(struct kvm_vcpu *vcpu)

{

	__vcpu_put_deactivate_traps(vcpu);

	__vcpu_put_switch_sysregs(vcpu);

}



static const exit_handler_fn hyp_exit_handlers[] = {

	[0 ... ESR_ELx_EC_MAX]		= NULL,

	[ESR_ELx_EC_CP15_32]		= kvm_hyp_handle_cp15_32,

arch/arm64/kvm/hyp/vhe/sysreg-sr.c

+4 −7
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void sysreg_restore_guest_state_vhe(struct kvm_cpu_context *ctxt) 
NOKPROBE_SYMBOL(sysreg_restore_guest_state_vhe);



/**

 * kvm_vcpu_load_sysregs_vhe - Load guest system registers to the physical CPU

 * __vcpu_load_switch_sysregs - Load guest system registers to the physical CPU

 *

 * @vcpu: The VCPU pointer

 *
@@ -62,7 +62,7 @@ NOKPROBE_SYMBOL(sysreg_restore_guest_state_vhe); 
 * and loading system register state early avoids having to load them on

 * every entry to the VM.

 */

void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu)

void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu)

{

	struct kvm_cpu_context *guest_ctxt = &vcpu->arch.ctxt;

	struct kvm_cpu_context *host_ctxt;
@@ -92,12 +92,10 @@ void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu) 
	__sysreg_restore_el1_state(guest_ctxt);



	vcpu_set_flag(vcpu, SYSREGS_ON_CPU);



	activate_traps_vhe_load(vcpu);

}



/**

 * kvm_vcpu_put_sysregs_vhe - Restore host system registers to the physical CPU

 * __vcpu_put_switch_syregs - Restore host system registers to the physical CPU

 *

 * @vcpu: The VCPU pointer

 *
@@ -107,13 +105,12 @@ void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu) 
 * and deferring saving system register state until we're no longer running the

 * VCPU avoids having to save them on every exit from the VM.

 */

void kvm_vcpu_put_sysregs_vhe(struct kvm_vcpu *vcpu)

void __vcpu_put_switch_sysregs(struct kvm_vcpu *vcpu)

{

	struct kvm_cpu_context *guest_ctxt = &vcpu->arch.ctxt;

	struct kvm_cpu_context *host_ctxt;



	host_ctxt = &this_cpu_ptr(&kvm_host_data)->host_ctxt;

	deactivate_traps_vhe_put(vcpu);



	__sysreg_save_el1_state(guest_ctxt);

	__sysreg_save_user_state(guest_ctxt);