Clearly my half-assed attempt at this series needed a bit of TLC. Respinning with Marc's diff to make sure the stage-2 is in a consistent state after VMID rollover and MMU notifiers triggering TLB invalidation. v2: https://lore.kernel.org/kvmarm/20231006093600.1250986-1-oliver.upton@xxxxxxxxx/ Marc Zyngier (2): KVM: arm64: Restore the stage-2 context in VHE's __tlb_switch_to_host() KVM: arm64: Reload stage-2 for VMID change on VHE Oliver Upton (3): KVM: arm64: Don't zero VTTBR in __tlb_switch_to_host() KVM: arm64: Rename helpers for VHE vCPU load/put KVM: arm64: Load the stage-2 MMU context in kvm_vcpu_load_vhe() arch/arm64/include/asm/kvm_host.h | 6 +++--- arch/arm64/include/asm/kvm_hyp.h | 2 ++ arch/arm64/kvm/arm.c | 9 +++++--- arch/arm64/kvm/hyp/vhe/switch.c | 33 ++++++++++++++++++------------ arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 11 ++++------ arch/arm64/kvm/hyp/vhe/tlb.c | 18 ++++++++++++---- arch/arm64/kvm/vmid.c | 11 +++++++--- 7 files changed, 57 insertions(+), 33 deletions(-) base-commit: 6465e260f48790807eef06b583b38ca9789b6072 -- 2.42.0.655.g421f12c284-goog