From patchwork Fri Apr 16 13:25:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 92742 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3FDSNIg008881 for ; Thu, 15 Apr 2010 13:28:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753772Ab0DON17 (ORCPT ); Thu, 15 Apr 2010 09:27:59 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:61391 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753720Ab0DON16 (ORCPT ); Thu, 15 Apr 2010 09:27:58 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id DBFC817011E; Thu, 15 Apr 2010 21:27:57 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o3FDQJvf032502; Thu, 15 Apr 2010 21:26:19 +0800 Received: from localhost.localdomain (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 54607DC2A3; Thu, 15 Apr 2010 21:30:47 +0800 (CST) Message-ID: <4BC8652F.5010006@cn.fujitsu.com> Date: Fri, 16 Apr 2010 21:25:03 +0800 From: Xiao Guangrong User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-3.9.b4.fc12 Thunderbird/3.0b4 MIME-Version: 1.0 To: Avi Kivity CC: Marcelo Tosatti , KVM list , LKML Subject: [PATCH v2 2/5] KVM MMU: fix kvm_mmu_zap_page() and its calling path References: <4BC864DD.3000606@cn.fujitsu.com> In-Reply-To: <4BC864DD.3000606@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Apr 2010 13:28:23 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index a23ca75..41cccd4 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1481,13 +1481,16 @@ static int mmu_zap_unsync_children(struct kvm *kvm, struct kvm_mmu_page *sp; for_each_sp(pages, sp, parents, i) { + if (list_empty(&kvm->arch.active_mmu_pages)) + goto exit; + kvm_mmu_zap_page(kvm, sp); mmu_pages_clear_parents(&parents); + zapped++; } - zapped += pages.nr; kvm_mmu_pages_init(parent, &parents, &pages); } - +exit: return zapped; } @@ -1540,7 +1543,7 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages) page = container_of(kvm->arch.active_mmu_pages.prev, struct kvm_mmu_page, link); - kvm_mmu_zap_page(kvm, page); + used_pages -= kvm_mmu_zap_page(kvm, page); used_pages--; } kvm->arch.n_free_mmu_pages = 0; @@ -1589,7 +1592,8 @@ static void mmu_unshadow(struct kvm *kvm, gfn_t gfn) && !sp->role.invalid) { pgprintk("%s: zap %lx %x\n", __func__, gfn, sp->role.word); - kvm_mmu_zap_page(kvm, sp); + if (kvm_mmu_zap_page(kvm, sp)) + nn = bucket->first; } } }