diff options
| author | Marc Zyngier <maz@kernel.org> | 2023-04-08 17:04:26 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2023-04-14 08:23:29 +0100 |
| commit | 1ff2755d6800d60bee96fb303cbbf30f9bb483a2 (patch) | |
| tree | 5dc09efa2f0fadf17bca930d2b920bbb894f1131 /arch | |
| parent | 8442d65373c6316876208c1ad27729e9682fa3cf (diff) | |
| download | linux-stable-1ff2755d6800d60bee96fb303cbbf30f9bb483a2.tar.gz linux-stable-1ff2755d6800d60bee96fb303cbbf30f9bb483a2.tar.bz2 linux-stable-1ff2755d6800d60bee96fb303cbbf30f9bb483a2.zip | |
KVM: arm64: vhe: Synchronise with page table walker on MMU update
Contrary to nVHE, VHE is a lot easier when it comes to dealing
with speculative page table walks started at EL1. As we only change
EL1&0 translation regime when context-switching, we already benefit
from the effect of the DSB that sits in the context switch code.
We only need to take care of it in the NV case, where we can
flip between between two EL1 contexts (one of them being the virtual
EL2) without a context switch.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/vhe/sysreg-sr.c b/arch/arm64/kvm/hyp/vhe/sysreg-sr.c index 7b44f6b3b547..b35a178e7e0d 100644 --- a/arch/arm64/kvm/hyp/vhe/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/vhe/sysreg-sr.c @@ -13,6 +13,7 @@ #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/kvm_hyp.h> +#include <asm/kvm_nested.h> /* * VHE: Host and guest must save mdscr_el1 and sp_el0 (and the PC and @@ -70,6 +71,17 @@ void kvm_vcpu_load_sysregs_vhe(struct kvm_vcpu *vcpu) __sysreg_save_user_state(host_ctxt); /* + * When running a normal EL1 guest, we only load a new vcpu + * after a context switch, which imvolves a DSB, so all + * speculative EL1&0 walks will have already completed. + * If running NV, the vcpu may transition between vEL1 and + * vEL2 without a context switch, so make sure we complete + * those walks before loading a new context. + */ + if (vcpu_has_nv(vcpu)) + dsb(nsh); + + /* * Load guest EL1 and user state * * We must restore the 32-bit state before the sysregs, thanks |