Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f00be0ca authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: MMU: do not free active mmu pages in free_mmu_pages() 



free_mmu_pages() should only undo what alloc_mmu_pages() does.
Free mmu pages from the generic VM destruction function, kvm_destroy_vm().

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e56d532f

arch/x86/kvm/mmu.c

+0 −8
Original line number Diff line number Diff line
@@ -2638,14 +2638,6 @@ EXPORT_SYMBOL_GPL(kvm_disable_tdp); 


static void free_mmu_pages(struct kvm_vcpu *vcpu)

{

	struct kvm_mmu_page *sp;



	while (!list_empty(&vcpu->kvm->arch.active_mmu_pages)) {

		sp = container_of(vcpu->kvm->arch.active_mmu_pages.next,

				  struct kvm_mmu_page, link);

		kvm_mmu_zap_page(vcpu->kvm, sp);

		cond_resched();

	}

	free_page((unsigned long)vcpu->arch.mmu.pae_root);

}

virt/kvm/kvm_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,8 @@ static void kvm_destroy_vm(struct kvm *kvm) 
#endif

#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER)

	mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm);

#else

	kvm_arch_flush_shadow(kvm);

#endif

	kvm_arch_destroy_vm(kvm);

	mmdrop(mm);