Commit 13aeb9b4 authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

KVM: arm64: Split hyp/sysreg-sr.c to VHE/nVHE 



sysreg-sr.c contains KVM's code for saving/restoring system registers, with
some code shared between VHE/nVHE. These common routines are moved to
a header file, VHE-specific code is moved to vhe/sysreg-sr.c and nVHE-specific
code to nvhe/sysreg-sr.c.

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-12-dbrazdil@google.com
parent d400c5b2

arch/arm64/include/asm/kvm_host.h

+3 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ struct kvm_vcpu_arch { 
	struct vcpu_reset_state	reset_state;



	/* True when deferrable sysregs are loaded on the physical CPU,

	 * see kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs. */

	 * see kvm_vcpu_load_sysregs_vhe and kvm_vcpu_put_sysregs_vhe. */

	bool sysregs_loaded_on_cpu;



	/* Guest PV state */
@@ -639,8 +639,8 @@ static inline int kvm_arm_have_ssbd(void) 
	}

}



void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu);

void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu);

void kvm_vcpu_put_sysregs_vhe(struct kvm_vcpu *vcpu);



int kvm_set_ipa_limit(void);

arch/arm64/include/asm/kvm_hyp.h

+3 −2
Original line number Diff line number Diff line
@@ -66,14 +66,15 @@ int __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu); 
void __timer_enable_traps(struct kvm_vcpu *vcpu);

void __timer_disable_traps(struct kvm_vcpu *vcpu);



#ifdef __KVM_NVHE_HYPERVISOR__

void __sysreg_save_state_nvhe(struct kvm_cpu_context *ctxt);

void __sysreg_restore_state_nvhe(struct kvm_cpu_context *ctxt);

#else

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);

void sysreg_restore_guest_state_vhe(struct kvm_cpu_context *ctxt);

void __sysreg32_save_state(struct kvm_vcpu *vcpu);

void __sysreg32_restore_state(struct kvm_vcpu *vcpu);

#endif



void __debug_switch_to_guest(struct kvm_vcpu *vcpu);

void __debug_switch_to_host(struct kvm_vcpu *vcpu);

arch/arm64/kernel/image-vars.h

+0 −7
Original line number Diff line number Diff line
@@ -76,13 +76,6 @@ KVM_NVHE_ALIAS(abort_guest_exit_start); 
KVM_NVHE_ALIAS(__fpsimd_restore_state);

KVM_NVHE_ALIAS(__fpsimd_save_state);



/* Symbols defined in sysreg-sr.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__kvm_enable_ssbs);

KVM_NVHE_ALIAS(__sysreg32_restore_state);

KVM_NVHE_ALIAS(__sysreg32_save_state);

KVM_NVHE_ALIAS(__sysreg_restore_state_nvhe);

KVM_NVHE_ALIAS(__sysreg_save_state_nvhe);



/* Symbols defined in timer-sr.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__kvm_timer_set_cntvoff);

KVM_NVHE_ALIAS(__timer_disable_traps);

arch/arm64/kvm/arm.c

+5 −3
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 


	kvm_vgic_load(vcpu);

	kvm_timer_vcpu_load(vcpu);

	kvm_vcpu_load_sysregs(vcpu);

	if (has_vhe())

		kvm_vcpu_load_sysregs_vhe(vcpu);

	kvm_arch_vcpu_load_fp(vcpu);

	kvm_vcpu_pmu_restore_guest(vcpu);

	if (kvm_arm_is_pvtime_enabled(&vcpu->arch))
@@ -369,7 +370,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)

{

	kvm_arch_vcpu_put_fp(vcpu);

	kvm_vcpu_put_sysregs(vcpu);

	if (has_vhe())

		kvm_vcpu_put_sysregs_vhe(vcpu);

	kvm_timer_vcpu_put(vcpu);

	kvm_vgic_put(vcpu);

	kvm_vcpu_pmu_restore_host(vcpu);
@@ -1302,7 +1304,7 @@ static void cpu_init_hyp_mode(void) 
	 */

	if (this_cpu_has_cap(ARM64_SSBS) &&

	    arm64_get_ssbd_state() == ARM64_SSBD_FORCE_DISABLE) {

		kvm_call_hyp(__kvm_enable_ssbs);

		kvm_call_hyp_nvhe(__kvm_enable_ssbs);

	}

}

arch/arm64/kvm/hyp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ subdir-ccflags-y := -I$(incdir) \ 
obj-$(CONFIG_KVM) += hyp.o vhe/ nvhe/

obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o



hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o sysreg-sr.o \

	 entry.o fpsimd.o

hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \

	 fpsimd.o



# KVM code is run at a different exception code with a different map, so

# compiler instrumentation that inserts callbacks or checks into the code may

CRA Git | Maintained and supported by SUSTech CRA and CCSE