Commit 40a50853 authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: Make kvm_call_hyp() a function call at Hyp 



kvm_call_hyp() has some logic to issue a function call or a hypercall
depending on the EL at which the kernel is running. However, all the
code compiled under __KVM_NVHE_HYPERVISOR__ is guaranteed to only run
at EL2 which allows us to simplify.

Add ifdefery to kvm_host.h to simplify kvm_call_hyp() in .hyp.text.

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210319100146.1149909-9-qperret@google.com
parent 380e18ad

arch/arm64/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ int kvm_test_age_hva(struct kvm *kvm, unsigned long hva); 
void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);



#ifndef __KVM_NVHE_HYPERVISOR__

#define kvm_call_hyp_nvhe(f, ...)						\

	({								\

		struct arm_smccc_res res;				\
@@ -632,6 +633,11 @@ void kvm_arm_resume_guest(struct kvm *kvm); 
									\

		ret;							\

	})

#else /* __KVM_NVHE_HYPERVISOR__ */

#define kvm_call_hyp(f, ...) f(__VA_ARGS__)

#define kvm_call_hyp_ret(f, ...) f(__VA_ARGS__)

#define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)

#endif /* __KVM_NVHE_HYPERVISOR__ */



void force_vm_exit(const cpumask_t *mask);

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);