Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933160AbbLOIrd (ORCPT ); Tue, 15 Dec 2015 03:47:33 -0500 Received: from mga02.intel.com ([134.134.136.20]:5574 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268AbbLOIrc (ORCPT ); Tue, 15 Dec 2015 03:47:32 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,431,1444719600"; d="scan'208";a="841415432" Subject: Re: [PATCH 09/11] KVM: MMU: simplify mmu_need_write_protect To: Xiao Guangrong , pbonzini@redhat.com References: <1448907973-36066-1-git-send-email-guangrong.xiao@linux.intel.com> <1448907973-36066-10-git-send-email-guangrong.xiao@linux.intel.com> Cc: gleb@kernel.org, mtosatti@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org From: Kai Huang Message-ID: <566FD2A1.7010601@linux.intel.com> Date: Tue, 15 Dec 2015 16:43:13 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1448907973-36066-10-git-send-email-guangrong.xiao@linux.intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2588 Lines: 86 On 12/01/2015 02:26 AM, Xiao Guangrong wrote: > Now, all non-leaf shadow page are page tracked, if gfn is not tracked > there is no non-leaf shadow page of gfn is existed, we can directly > make the shadow page of gfn to unsync > > Signed-off-by: Xiao Guangrong > --- > arch/x86/kvm/mmu.c | 26 ++++++++------------------ > 1 file changed, 8 insertions(+), 18 deletions(-) > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index 5a2ca73..f89e77f 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -2461,41 +2461,31 @@ static void __kvm_unsync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) > kvm_mmu_mark_parents_unsync(sp); > } > > -static void kvm_unsync_pages(struct kvm_vcpu *vcpu, gfn_t gfn) > +static bool kvm_unsync_pages(struct kvm_vcpu *vcpu, gfn_t gfn, > + bool can_unsync) > { > struct kvm_mmu_page *s; > > for_each_gfn_indirect_valid_sp(vcpu->kvm, s, gfn) { > + if (!can_unsync) > + return true; How about moving this right before for_each_gfn_indirect_valid_sp? As can_unsync is passed as parameter, so there's no point checking it several times. A further thinking is can we move it to mmu_need_write_protect? Passing can_unsync as parameter to kvm_unsync_pages sounds a little bit odd. > + > if (s->unsync) > continue; > WARN_ON(s->role.level != PT_PAGE_TABLE_LEVEL); How about large page mapping? Such as if guest uses 2M mapping and its shadow is indirect, does above WARN_ON still meet? As you removed the PT level check in mmu_need_write_protect. Thanks, -Kai > __kvm_unsync_page(vcpu, s); > } > + > + return false; > } > > static bool mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn, > bool can_unsync) > { > - struct kvm_mmu_page *s; > - bool need_unsync = false; > - > if (kvm_page_track_check_mode(vcpu, gfn, KVM_PAGE_TRACK_WRITE)) > return true; > > - for_each_gfn_indirect_valid_sp(vcpu->kvm, s, gfn) { > - if (!can_unsync) > - return true; > - > - if (s->role.level != PT_PAGE_TABLE_LEVEL) > - return true; > - > - if (!s->unsync) > - need_unsync = true; > - } > - if (need_unsync) > - kvm_unsync_pages(vcpu, gfn); > - > - return false; > + return kvm_unsync_pages(vcpu, gfn, can_unsync); > } > > static bool kvm_is_mmio_pfn(pfn_t pfn) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/