From patchwork Thu Mar 19 10:20:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 13036 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2JAOV2e004896 for ; Thu, 19 Mar 2009 10:24:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbZCSKY3 (ORCPT ); Thu, 19 Mar 2009 06:24:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752246AbZCSKY3 (ORCPT ); Thu, 19 Mar 2009 06:24:29 -0400 Received: from mx2.redhat.com ([66.187.237.31]:43317 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbZCSKY2 (ORCPT ); Thu, 19 Mar 2009 06:24:28 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2JAOR5S020279 for ; Thu, 19 Mar 2009 06:24:27 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n2JAOOpS014615; Thu, 19 Mar 2009 06:24:24 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n2JAOQgu024232; Thu, 19 Mar 2009 06:24:26 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 587) id 22CB018D41C; Thu, 19 Mar 2009 12:20:36 +0200 (IST) Date: Thu, 19 Mar 2009 12:20:36 +0200 From: Gleb Natapov To: avi@redhat.com, marcelo@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH v2] do not free active mmu pages in free_mmu_pages() Message-ID: <20090319102036.GB10767@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org free_mmu_pages() should only undo what alloc_mmu_pages() does. Free mmu pages from generic VM destruction function. Signed-off-by: Gleb Natapov --- Gleb. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 2a36f7f..b625ed4 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -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); } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 68b217e..92ef725 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -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);