Commit 09cf57eb authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

KVM: arm64: Split hyp/switch.c to VHE/nVHE 



switch.c implements context-switching for KVM, with large parts shared between
VHE/nVHE. These common routines are moved to a header file, VHE-specific code
is moved to vhe/switch.c and nVHE-specific code is moved to nvhe/switch.c.

Previously __kvm_vcpu_run needed a different symbol name for VHE/nVHE. This
is cleaned up and the caller in arm.c simplified.

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-10-dbrazdil@google.com
parent e03fa291

arch/arm64/include/asm/kvm_asm.h

+1 −3
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu); 


extern void __kvm_timer_set_cntvoff(u64 cntvoff);



extern int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu);



extern int __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu);

extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);



extern void __kvm_enable_ssbs(void);

arch/arm64/include/asm/kvm_hyp.h

+6 −0
Original line number Diff line number Diff line
@@ -81,11 +81,17 @@ void __debug_switch_to_host(struct kvm_vcpu *vcpu); 
void __fpsimd_save_state(struct user_fpsimd_state *fp_regs);

void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);



#ifndef __KVM_NVHE_HYPERVISOR__

void activate_traps_vhe_load(struct kvm_vcpu *vcpu);

void deactivate_traps_vhe_put(void);

#endif



u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt);



void __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt);

#ifdef __KVM_NVHE_HYPERVISOR__

void __noreturn __hyp_do_panic(unsigned long, ...);

#endif



#endif /* __ARM64_KVM_HYP_H__ */

arch/arm64/kernel/image-vars.h

+34 −3
Original line number Diff line number Diff line
@@ -63,30 +63,50 @@ __efistub__ctype = _ctype; 


#define KVM_NVHE_ALIAS(sym) __kvm_nvhe_##sym = sym;



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

KVM_NVHE_ALIAS(kvm_skip_instr32);



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

KVM_NVHE_ALIAS(__debug_switch_to_guest);

KVM_NVHE_ALIAS(__debug_switch_to_host);

KVM_NVHE_ALIAS(__kvm_get_mdcr_el2);



/* Symbols defined in entry.S (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__guest_enter);

KVM_NVHE_ALIAS(__guest_exit);

KVM_NVHE_ALIAS(abort_guest_exit_end);

KVM_NVHE_ALIAS(abort_guest_exit_start);



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

KVM_NVHE_ALIAS(__kvm_vcpu_run_nvhe);

KVM_NVHE_ALIAS(hyp_panic);

/* Symbols defined in fpsimd.S (not yet compiled with nVHE build rules). */

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

KVM_NVHE_ALIAS(__timer_enable_traps);



/* Symbols defined in vgic-v2-cpuif-proxy.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__vgic_v2_perform_cpuif_access);



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

KVM_NVHE_ALIAS(__vgic_v3_activate_traps);

KVM_NVHE_ALIAS(__vgic_v3_deactivate_traps);

KVM_NVHE_ALIAS(__vgic_v3_get_ich_vtr_el2);

KVM_NVHE_ALIAS(__vgic_v3_init_lrs);

KVM_NVHE_ALIAS(__vgic_v3_perform_cpuif_access);

KVM_NVHE_ALIAS(__vgic_v3_read_vmcr);

KVM_NVHE_ALIAS(__vgic_v3_restore_aprs);

KVM_NVHE_ALIAS(__vgic_v3_restore_state);

KVM_NVHE_ALIAS(__vgic_v3_save_aprs);

KVM_NVHE_ALIAS(__vgic_v3_save_state);

KVM_NVHE_ALIAS(__vgic_v3_write_vmcr);



/* Alternative callbacks for init-time patching of nVHE hyp code. */
@@ -97,11 +117,13 @@ KVM_NVHE_ALIAS(kvm_update_va_mask); 
/* Global kernel state accessed by nVHE hyp code. */

KVM_NVHE_ALIAS(arm64_ssbd_callback_required);

KVM_NVHE_ALIAS(kvm_host_data);

KVM_NVHE_ALIAS(kvm_vgic_global_state);



/* Kernel constant needed to compute idmap addresses. */

KVM_NVHE_ALIAS(kimage_voffset);



/* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */

KVM_NVHE_ALIAS(__hyp_panic_string);

KVM_NVHE_ALIAS(panic);



/* Vectors installed by hyp-init on reset HVC. */
@@ -118,6 +140,15 @@ KVM_NVHE_ALIAS(arm64_const_caps_ready); 
KVM_NVHE_ALIAS(cpu_hwcap_keys);

KVM_NVHE_ALIAS(cpu_hwcaps);



/* Static keys which are set if a vGIC trap should be handled in hyp. */

KVM_NVHE_ALIAS(vgic_v2_cpuif_trap);

KVM_NVHE_ALIAS(vgic_v3_cpuif_trap);



/* Static key checked in pmr_sync(). */

#ifdef CONFIG_ARM64_PSEUDO_NMI

KVM_NVHE_ALIAS(gic_pmr_sync);

#endif



#endif /* CONFIG_KVM */



#endif /* __ARM64_KERNEL_IMAGE_VARS_H */

arch/arm64/kvm/arm.c

+1 −5
Original line number Diff line number Diff line
@@ -748,11 +748,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		trace_kvm_entry(*vcpu_pc(vcpu));

		guest_enter_irqoff();



		if (has_vhe()) {

			ret = kvm_vcpu_run_vhe(vcpu);

		} else {

			ret = kvm_call_hyp_ret(__kvm_vcpu_run_nvhe, vcpu);

		}

		ret = kvm_call_hyp_ret(__kvm_vcpu_run, vcpu);



		vcpu->mode = OUTSIDE_GUEST_MODE;

		vcpu->stat.exits++;

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 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 \

	 debug-sr.o entry.o switch.o fpsimd.o

	 debug-sr.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