summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/kvm_hyp.h
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2020-09-15 11:46:32 +0100
committerMarc Zyngier <maz@kernel.org>2020-09-15 18:39:02 +0100
commitb619d9aa8b385bdab747df596961d8fdddde4d52 (patch)
tree017e178811d63555ab3d06b5fee6026ea181b6ff /arch/arm64/include/asm/kvm_hyp.h
parent472fc011ccd30f05e0b39d71064777d39dd11cac (diff)
downloadlinux-b619d9aa8b385bdab747df596961d8fdddde4d52.tar.bz2
KVM: arm64: Introduce hyp context
During __guest_enter, save and restore from a new hyp context rather than the host context. This is preparation for separation of the hyp and host context in nVHE. Signed-off-by: Andrew Scull <ascull@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200915104643.2543892-9-ascull@google.com
Diffstat (limited to 'arch/arm64/include/asm/kvm_hyp.h')
-rw-r--r--arch/arm64/include/asm/kvm_hyp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index 1e2491da324e..0b525e05e5bf 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -12,6 +12,7 @@
#include <asm/alternative.h>
#include <asm/sysreg.h>
+DECLARE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
DECLARE_PER_CPU(unsigned long, kvm_hyp_vector);
#define read_sysreg_elx(r,nvh,vh) \
@@ -89,7 +90,7 @@ 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);
+u64 __guest_enter(struct kvm_vcpu *vcpu);
void __noreturn hyp_panic(void);
#ifdef __KVM_NVHE_HYPERVISOR__