diff options
| author |   Andrew Scull <ascull@google.com> | 2020-09-15 11:46:32 +0100 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2020-09-15 18:39:02 +0100 |
| commit | b619d9aa8b385bdab747df596961d8fdddde4d52 (patch) | |
| tree | 017e178811d63555ab3d06b5fee6026ea181b6ff /arch/arm64/kvm/hyp/entry.S | |
| parent | KVM: arm64: nVHE: Don't consume host SErrors with ESB (diff) | |
| download | linux-dev-b619d9aa8b385bdab747df596961d8fdddde4d52.tar.xz linux-dev-b619d9aa8b385bdab747df596961d8fdddde4d52.zip | |
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/kvm/hyp/entry.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/entry.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 76e7eaf4675e..9551d7f186da 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -57,15 +57,15 @@ .endm /* - * u64 __guest_enter(struct kvm_vcpu *vcpu, - * struct kvm_cpu_context *host_ctxt); + * u64 __guest_enter(struct kvm_vcpu *vcpu); */ SYM_FUNC_START(__guest_enter) // x0: vcpu - // x1: host context - // x2-x17: clobbered by macros + // x1-x17: clobbered by macros // x29: guest context + hyp_adr_this_cpu x1, kvm_hyp_ctxt, x2 + // Store the host regs save_callee_saved_regs x1 @@ -148,7 +148,7 @@ SYM_INNER_LABEL(__guest_exit, SYM_L_GLOBAL) // Store the guest's sp_el0 save_sp_el0 x1, x2 - get_host_ctxt x2, x3 + hyp_adr_this_cpu x2, kvm_hyp_ctxt, x3 // Macro ptrauth_switch_to_guest format: // ptrauth_switch_to_host(guest cxt, host cxt, tmp1, tmp2, tmp3) |