From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiao Guangrong Subject: Re: [PATCH v2] KVM: Avoid zapping unrelated shadows in __kvm_set_memory_region() Date: Wed, 11 Apr 2012 11:11:07 +0800 Message-ID: <4F84F64B.4090704@linux.vnet.ibm.com> References: <20120410220503.36efa6bfb776e741ba076115@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: avi@redhat.com, mtosatti@redhat.com, kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp To: Takuya Yoshikawa Return-path: Received: from e28smtp04.in.ibm.com ([122.248.162.4]:47410 "EHLO e28smtp04.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756018Ab2DKDLV (ORCPT ); Tue, 10 Apr 2012 23:11:21 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Apr 2012 08:41:18 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3B3BBPm4513874 for ; Wed, 11 Apr 2012 08:41:12 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3B8ePkx020572 for ; Wed, 11 Apr 2012 18:40:26 +1000 In-Reply-To: <20120410220503.36efa6bfb776e741ba076115@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: On 04/10/2012 09:05 PM, Takuya Yoshikawa wrote: > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index 29ad6f9..a50f7ba 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -3930,16 +3930,30 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot) > kvm_flush_remote_tlbs(kvm); > } > > -void kvm_mmu_zap_all(struct kvm *kvm) > +/** > + * kvm_mmu_zap_all - zap all shadows which have mappings into a given slot > + * @kvm: the kvm instance > + * @slot: id of the target slot > + * > + * If @slot is -1, zap all shadow pages. > + */ > +void kvm_mmu_zap_all(struct kvm *kvm, int slot) > { > struct kvm_mmu_page *sp, *node; > LIST_HEAD(invalid_list); > + int zapped; > > spin_lock(&kvm->mmu_lock); > restart: > - list_for_each_entry_safe(sp, node, &kvm->arch.active_mmu_pages, link) > - if (kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list)) > - goto restart; > + zapped = 0; > + list_for_each_entry_safe(sp, node, &kvm->arch.active_mmu_pages, link) { > + if ((slot >= 0) && !test_bit(slot, sp->slot_bitmap)) > + continue; > + > + zapped |= kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list); You should "goto restart" here like the origin code, also, "safe" version of list_for_each is not needed.