From nobody Mon Apr 29 14:48:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490599530607919.9662586707394; Mon, 27 Mar 2017 00:25:30 -0700 (PDT) Received: from localhost ([::1]:44788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csP1t-0008VO-4i for importer@patchew.org; Mon, 27 Mar 2017 03:25:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csOya-00066z-A6 for qemu-devel@nongnu.org; Mon, 27 Mar 2017 03:22:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csOyX-0002aj-7f for qemu-devel@nongnu.org; Mon, 27 Mar 2017 03:22:04 -0400 Received: from [45.249.212.189] (port=2878 helo=dggrg03-dlp.huawei.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1csOyW-0002Wm-Ns for qemu-devel@nongnu.org; Mon, 27 Mar 2017 03:22:01 -0400 Received: from 172.30.72.54 (EHLO DGGEML404-HUB.china.huawei.com) ([172.30.72.54]) by dggrg03-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AKS37792; Mon, 27 Mar 2017 15:21:40 +0800 (CST) Received: from [127.0.0.1] (10.177.19.20) by DGGEML404-HUB.china.huawei.com (10.3.17.39) with Microsoft SMTP Server id 14.3.301.0; Mon, 27 Mar 2017 15:21:29 +0800 To: , , References: <20170325111424.21752-1-herongguang.he@huawei.com> From: "Herongguang (Stephen)" Message-ID: <58D8BD6D.8080404@huawei.com> Date: Mon, 27 Mar 2017 15:21:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20170325111424.21752-1-herongguang.he@huawei.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.177.19.20] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.58D8BD84.047D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 748d224ae185df78afde60dc6a6f9e4e X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.189 Subject: [Qemu-devel] [PATCH v2] KVM: pci-assign: do not map smm memory slot pages X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangxinxin.wang@huawei.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8"; format="flowed" From f6f0ee6831488bef7af841cb86f3d85a04848fe5 Mon Sep 17 00:00:00 2001 From: herongguang Date: Mon, 27 Mar 2017 15:08:59 +0800 Subject: [PATCH] KVM: pci-assign: do not map smm memory slot pages in vt-d page table or VM memory are not put thus leaked in kvm_iommu_unmap_memslots() when destroy VM. This is consistent with current vfio implementation. --- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 482612b..9018d06 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1052,7 +1052,7 @@ int __kvm_set_memory_region(struct kvm *kvm, * changes) is disallowed above, so any other attribute changes getting * here can be skipped. */ - if ((change =3D=3D KVM_MR_CREATE) || (change =3D=3D KVM_MR_MOVE)) { + if ((as_id =3D=3D 0) && ((change =3D=3D KVM_MR_CREATE) || (change =3D=3D = KVM_MR_MOVE))) { r =3D kvm_iommu_map_pages(kvm, &new); return r; } --=20 1.7.12.4 On 2017/3/25 19:14, herongguang wrote: > or pages are not unmaped and freed > > Signed-off-by: herongguang > --- > arch/x86/kvm/iommu.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > Well, do we should change pci-assign to not map SMM slots instead? Like v= fio. > > diff --git a/arch/x86/kvm/iommu.c b/arch/x86/kvm/iommu.c > index b181426..5b931bb 100644 > --- a/arch/x86/kvm/iommu.c > +++ b/arch/x86/kvm/iommu.c > @@ -320,15 +320,17 @@ void kvm_iommu_unmap_pages(struct kvm *kvm, struct = kvm_memory_slot *slot) > static int kvm_iommu_unmap_memslots(struct kvm *kvm) > { > int idx; > - struct kvm_memslots *slots; > + struct kvm_memslots *slots, *smm_slots; > struct kvm_memory_slot *memslot; > > idx =3D srcu_read_lock(&kvm->srcu); > slots =3D kvm_memslots(kvm); > - > kvm_for_each_memslot(memslot, slots) > kvm_iommu_unmap_pages(kvm, memslot); > > + smm_slots =3D __kvm_memslots(kvm, 1); > + kvm_for_each_memslot(memslot, smm_slots) > + kvm_iommu_unmap_pages(kvm, memslot); > srcu_read_unlock(&kvm->srcu, idx); > > if (kvm->arch.iommu_noncoherent) >