[PATCH 4/4] KVM: arm64: nv: Move TLBI VMALLS12E1* emulation over to kvm_stage2_unmap_all()
From: Marc Zyngier <maz@kernel.org>
Date: 2026-09-12 10:48:43
Also in:
kvmarm
Subsystem:
arm64 port (aarch64 architecture), kernel virtual machine for arm64 (kvm/arm64), the rest · Maintainers:
Catalin Marinas, Will Deacon, Marc Zyngier, Oliver Upton, Linus Torvalds
Instead of emulating TLBI VMALLS12E1* with a range invalidation, use kvm_stage2_unmap_all() which is more efficient, specially in deeply nested cases. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kvm/sys_regs.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 44aae52c473d7..2c90e185c6e8e 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c@@ -4124,26 +4124,24 @@ static void s2_mmu_unmap_range(struct kvm_s2_mmu *mmu, kvm_stage2_unmap_range(mmu, info->range.start, info->range.size, true); } +static void s2_mmu_unmap_all(struct kvm_s2_mmu *mmu, + const union tlbi_info *info) +{ + kvm_stage2_unmap_all(mmu, true); +} + static bool handle_vmalls12e1is(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { u32 sys_encoding = sys_insn(p->Op0, p->Op1, p->CRn, p->CRm, p->Op2); - u64 limit, vttbr; + u64 vttbr; if (!kvm_supported_tlbi_s12_op(vcpu, sys_encoding)) return undef_access(vcpu, p, r); vttbr = vcpu_read_sys_reg(vcpu, VTTBR_EL2); - limit = BIT_ULL(kvm_get_pa_bits(vcpu->kvm)); - kvm_s2_mmu_iterate_by_vmid(vcpu->kvm, get_vmid(vttbr), - &(union tlbi_info) { - .range = { - .start = 0, - .size = limit, - }, - }, - s2_mmu_unmap_range); + kvm_s2_mmu_iterate_by_vmid(vcpu->kvm, get_vmid(vttbr), NULL, s2_mmu_unmap_all); return true; }
--
2.47.3