]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: Destroy stage-2 page-table in kvm_arch_destroy_vm()
authorWill Deacon <will@kernel.org>
Fri, 27 Mar 2026 19:27:57 +0000 (19:27 +0000)
committerMarc Zyngier <maz@kernel.org>
Wed, 1 Apr 2026 15:48:16 +0000 (16:48 +0100)
kvm_arch_destroy_vm() can be called on the kvm_create_vm() error path
after we have failed to register the MMU notifiers for the new VM. In
this case, we cannot rely on the MMU ->release() notifier to call
kvm_arch_flush_shadow_all() and so the stage-2 page-table allocated in
kvm_arch_init_vm() will be leaked.

Explicitly destroy the stage-2 page-table in kvm_arch_destroy_vm(), so
that we clean up after kvm_arch_destroy_vm() without relying on the MMU
notifiers.

Link: https://sashiko.dev/#/patchset/20260327140039.21228-1-will%40kernel.org?patch=12265
Signed-off-by: Will Deacon <will@kernel.org>
Link: https://patch.msgid.link/20260327192758.21739-3-will@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/arm.c

index 410ffd41fd73aadfbdedd8892dfb2f0534416605..29bfa79555b2eeeb25b4289b76c8a2e3f945fb3a 100644 (file)
@@ -301,6 +301,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
        if (is_protected_kvm_enabled())
                pkvm_destroy_hyp_vm(kvm);
 
+       kvm_uninit_stage2_mmu(kvm);
        kvm_destroy_mpidr_data(kvm);
 
        kfree(kvm->arch.sysreg_masks);