diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:17:21 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:17:21 -0800 |
| commit | d13f3207816596ef415660d011fec4ac6016d630 (patch) | |
| tree | 1fb40efb7a038d73ab455b610f5cb2daa0515dcc | |
| parent | 5289cdcc9189f993d8f875676f68bd85f00c8092 (diff) | |
Revert: KVM: MMU: do not free active mmu pages in free_mmu_pages()
This reverts the commit d2127c8300fb1ec54af56faee17170e7a525326d, which was
the commit f00be0cae4e6ad0a8c7be381c6d9be3586800b3e upstream.
This was done based on comments saying it was causing problems.
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/mmu.c | 8 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 95c65e32b40f..839d0f9e4aec 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1995,6 +1995,14 @@ 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); } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index db062b538b6f..cecfc13af505 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -406,8 +406,6 @@ 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); |