From nobody Fri May 3 04:45:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686218765; cv=none; d=zohomail.com; s=zohoarc; b=NS3lZgnfv0VMkLZg4GNC8bZIzXD7tSQoQZCj1wDFgK+boA+8MPV8mrEpEPOq58cFuYIYIpx7R07mwG04F9oufyFtWRkwXSs6msn66LWfvzStK0T1/cPh/Ak0f/j7S/VLJ3aJv7fvlIqxfo7B1T5kyUUWRhV9EE2IS8T+KF+JD4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686218765; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i9X/rSfbkpVrv3OWImxf0cmPV6v+XJdERegC1TrnsME=; b=Raj+xQc5+Fa+bB1sC5Xh71WqTTSobd9m9eaHMw4LmHSZFtpRhbu8pYG7crY2pLrhE4QsfkuNJvXE9Hm66pKD79BMSe1vc0eOYOJT3LPdDe92UfiEI4FmjfC4TMi+njuNJh+t1QLpSN71Hz96yZCchkTVvkAAP7y2t/mcnisfmFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686218765584395.2287437739029; Thu, 8 Jun 2023 03:06:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7CWP-000059-Or; Thu, 08 Jun 2023 06:05:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWM-0008VC-Az for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:35 -0400 Received: from mga17.intel.com ([192.55.52.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWI-0007r9-O3 for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:32 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:26 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686218730; x=1717754730; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OaIkrpT4BJ2w/bnS1O5gHV/Ymm37eAt1QkoERXNUudw=; b=TyH2348QyE4Tmn1j+UvjHHH3GwXml4M3a8iG7amoaqWuIMpCABr92Hh2 I+k/CWT8Ndz2o3Ch8eONPHu4g/r5jYh/m6sudeUmI87zn+4Au0uQHTIzW 66Mj5Ycq2y/oQpFxFVPhQH4CmT3xONKxyB1u8sqqtiHfF8HERbMwgwVRe 5JXRLCbhCrm24rhjCblFQrRVu2vCUFQjIO6poV2dSi9sc2OS1l2qPUVqD PHGvIukdx+uxGjaPIcZvEcOpB4y3ccMCM+naE44IYX6yHTf5hrP4A5RRs CcRf0mqIJgR3qA63xA35utwZqzanmertl7oTvtZt5bHjAuBqFvLykhjdh A==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="337624405" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="337624405" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="956652033" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="956652033" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, alex.williamson@redhat.com, clg@redhat.com, david@redhat.com, philmd@linaro.org, kwankhede@nvidia.com, cjia@nvidia.com, yi.l.liu@intel.com, chao.p.peng@intel.com Subject: [PATCH v3 1/5] util: Add iova_tree_foreach_range_data Date: Thu, 8 Jun 2023 17:52:27 +0800 Message-Id: <20230608095231.225450-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com> References: <20230608095231.225450-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=zhenzhong.duan@intel.com; helo=mga17.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686218766588100003 Content-Type: text/plain; charset="utf-8" This function is a variant of iova_tree_foreach and support tranversing a range to trigger callback with a private data. Reviewed-by: Peter Xu Signed-off-by: Zhenzhong Duan --- include/qemu/iova-tree.h | 17 +++++++++++++++-- util/iova-tree.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h index 8528e5c98fbc..df3dba79e671 100644 --- a/include/qemu/iova-tree.h +++ b/include/qemu/iova-tree.h @@ -39,6 +39,7 @@ typedef struct DMAMap { IOMMUAccessFlags perm; } QEMU_PACKED DMAMap; typedef gboolean (*iova_tree_iterator)(DMAMap *map); +typedef gboolean (*iova_tree_iterator_2)(DMAMap *map, gpointer *private); =20 /** * iova_tree_new: @@ -131,11 +132,23 @@ const DMAMap *iova_tree_find_address(const IOVATree *= tree, hwaddr iova); * @iterator: the interator for the mappings, return true to stop * * Iterate over the iova tree. - * - * Return: 1 if found any overlap, 0 if not, <0 if error. */ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator); =20 +/** + * iova_tree_foreach_range_data: + * + * @tree: the iova tree to iterate on + * @range: the iova range to iterate in + * @func: the interator for the mappings, return true to stop + * @private: parameter passed to @func + * + * Iterate over an iova range in iova tree. + */ +void iova_tree_foreach_range_data(IOVATree *tree, DMAMap *range, + iova_tree_iterator_2 func, + gpointer *private); + /** * iova_tree_alloc_map: * diff --git a/util/iova-tree.c b/util/iova-tree.c index 536789797e47..a3cbd5198410 100644 --- a/util/iova-tree.c +++ b/util/iova-tree.c @@ -42,6 +42,12 @@ typedef struct IOVATreeFindIOVAArgs { const DMAMap *result; } IOVATreeFindIOVAArgs; =20 +typedef struct IOVATreeIterator { + DMAMap *range; + iova_tree_iterator_2 func; + gpointer *private; +} IOVATreeIterator; + /** * Iterate args to the next hole * @@ -164,6 +170,31 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_itera= tor iterator) g_tree_foreach(tree->tree, iova_tree_traverse, iterator); } =20 +static gboolean iova_tree_traverse_range(gpointer key, gpointer value, + gpointer data) +{ + DMAMap *map =3D key; + IOVATreeIterator *iterator =3D data; + DMAMap *range =3D iterator->range; + + g_assert(key =3D=3D value); + + if (iova_tree_compare(map, range, NULL)) { + return false; + } + + return iterator->func(map, iterator->private); +} + +void iova_tree_foreach_range_data(IOVATree *tree, DMAMap *range, + iova_tree_iterator_2 func, + gpointer *private) +{ + IOVATreeIterator iterator =3D {range, func, private}; + + g_tree_foreach(tree->tree, iova_tree_traverse_range, &iterator); +} + void iova_tree_remove(IOVATree *tree, DMAMap map) { const DMAMap *overlap; --=20 2.34.1 From nobody Fri May 3 04:45:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686218765; cv=none; d=zohomail.com; s=zohoarc; b=QZTK8lSLRSTZBFnz5vlpzeJba8td271NBLaGu3hYzkzfhToH7O8CkyOHkYdV0/MP61CowLDJ72PoAa67pB9aOvDDUmW2pT2wFWsK2N8r0aobG/vO1tl7M67J2ORRxtTRhoMNDp0qKiq8IqxVirzcojqxhCpFXvXPlcpLC2U/IFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686218765; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jsfw/e/RvIxyVJdwomOlA4/ZIdLHdVMpfC2r5uqkMD8=; b=Xq1WN3XgSBuWBSLb9ETMlf/4/POnLzkEVhnjg+hp4f72GIoq4UMp7rjcI0iHqUtGz/ibrvzNxExSsLJ0IzmvYIXoAQmi3SKT7hnXevK+ZNAFSeMYU87dE7zOeidPaM8hzydjTAGVtzu7S8jMr107he0Ayg30+boyFrDKvmTlCAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686218765579787.9917032960097; Thu, 8 Jun 2023 03:06:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7CWa-00007B-Df; Thu, 08 Jun 2023 06:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWP-00004z-E0 for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:37 -0400 Received: from mga17.intel.com ([192.55.52.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWM-0007rz-0F for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:35 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:30 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686218734; x=1717754734; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IjNIqIydqN09clBHDQ6C2od4itkNTcrM6ssdImRA6h8=; b=bL9vsJUCeH7M2EcSWK8hVs4g4QCu5wCasCnwS4fqf3GcoX/CqzQA+akK UubziOuUJhvo6jtxFo0LO34ncT+Ax8RI0Ic2fQHQvb2w8nNgp+D9LEqn1 i1YiZ5aBd1OOWsSEarWOv5agjhXPUaHrhiIvXqhe/975lniFE53w1otPp HkYdHF9PoClwamD6iTy64h6wNTywPXZzMvI3XB2TtwqYvZE+HF7C7TLgp cXZ2zTrjaBudKtJjvzOxAyVKPQQ1OYfz3EMVrtOximCFriKTUT3Gb/JVc euaSFqyxZMz7uaXCOSy3Q6ZsgtSmC87ihgbD+aAJ9l1E/KN8zjfXnjC2k Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="337624420" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="337624420" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="956652054" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="956652054" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, alex.williamson@redhat.com, clg@redhat.com, david@redhat.com, philmd@linaro.org, kwankhede@nvidia.com, cjia@nvidia.com, yi.l.liu@intel.com, chao.p.peng@intel.com Subject: [PATCH v3 2/5] intel_iommu: Fix a potential issue in VFIO dirty page sync Date: Thu, 8 Jun 2023 17:52:28 +0800 Message-Id: <20230608095231.225450-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com> References: <20230608095231.225450-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=zhenzhong.duan@intel.com; helo=mga17.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686218767866100011 Content-Type: text/plain; charset="utf-8" Peter Xu found a potential issue: "The other thing is when I am looking at the new code I found that we actually extended the replay() to be used also in dirty tracking of vfio, in vfio_sync_dirty_bitmap(). For that maybe it's already broken if unmap_all() because afaiu log_sync() can be called in migration thread anytime during DMA so I think it means the device is prone to DMA with the IOMMU pgtable quickly erased and rebuilt here, which means the DMA could fail unexpectedly. Copy Alex, Kirti and Neo." Fix it by replacing the unmap_all() to only evacuate the iova tree (keeping all host mappings untouched, IOW, don't notify UNMAP), and do a full resync in page walk which will notify all existing mappings as MAP. This way we don't interrupt with any existing mapping if there is (e.g. for the dirty sync case), meanwhile we keep sync too to latest (for moving a vfio device into an existing iommu group). Suggested-by: Peter Xu Signed-off-by: Zhenzhong Duan Reviewed-by: Peter Xu --- hw/i386/intel_iommu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 94d52f4205d2..34af12f392f5 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3825,13 +3825,10 @@ static void vtd_iommu_replay(IOMMUMemoryRegion *iom= mu_mr, IOMMUNotifier *n) IntelIOMMUState *s =3D vtd_as->iommu_state; uint8_t bus_n =3D pci_bus_num(vtd_as->bus); VTDContextEntry ce; + DMAMap map =3D { .iova =3D 0, .size =3D HWADDR_MAX }; =20 - /* - * The replay can be triggered by either a invalidation or a newly - * created entry. No matter what, we release existing mappings - * (it means flushing caches for UNMAP-only registers). - */ - vtd_address_space_unmap(vtd_as, n); + /* replay is protected by BQL, page walk will re-setup it safely */ + iova_tree_remove(vtd_as->iova_tree, map); =20 if (vtd_dev_to_context_entry(s, bus_n, vtd_as->devfn, &ce) =3D=3D 0) { trace_vtd_replay_ce_valid(s->root_scalable ? "scalable mode" : --=20 2.34.1 From nobody Fri May 3 04:45:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686218807; cv=none; d=zohomail.com; s=zohoarc; b=hHBitBZ4Se/XBeBtobsdGsH7QtLwjBH2PGJebuokH/MPUHIMHvuTIwVv9waDzhAO/PdD8LVgwD+zxpWSX+QIRPpcu7dbHqH3ivmcH7kVeln4h8mUJSVIiHIVXyjLfNItb9woD1wOUTUUEVx/0RBsb7NAuZF1J1Sc/MHO74m9nNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686218807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YMuh8VLdtQm1QB+EwvlvrRWAMtASg1fot4JFVfqALFk=; b=J3vqz/trPOq35Oce/mz329xCK6O+FSupEg1OumkzqdSXJ28FFShtn4Ys7Vu6X0LV05LJGP42OloDobt6Dc5E7XsTol5XVfaD2KKXAvBwdVJQ5egjXsRbK6Od2sDP511PuGEmpFq/EIEm/GhfUysb8PnEbv4Abbobbb/aL3WwmjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686218807837774.6140823567772; Thu, 8 Jun 2023 03:06:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7CWi-0000AL-Qw; Thu, 08 Jun 2023 06:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWY-00007I-Dk for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:48 -0400 Received: from mga17.intel.com ([192.55.52.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWR-0007tA-8C for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:43 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:34 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686218739; x=1717754739; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=k6pazZM8t2kfEFHaI7eml0v1NUuRM/XJAG7pYSmrhXU=; b=AIV2tIhts6SHvzRjNnpY2g+7X3ZFJ4dj2/daELWG8aA1xLSMLoZOnA3V sqTi8vK9g6M4t5vAvPDNf7+c0Qi7V+BoGsHl/FA3ESzpxoHg/suIHc9F8 vc7y59/oDYL2nnFEQgkehHnT+uWlLQSO7T+GxtGsWkDCsScyBmNJW+Psa 6Fww0cCjVLRr2jKTX3ftVXlLtvkve6ly8d5L75qWtz2A7kczJ6yW28HjZ IIO9K6FmVguLbLqVhRbGgFvFyIkJtM/Y67A07kQuh38x+8ymEDtdR3KyX Mj7bVAYVYOXRGDvhuECaSbnUbubbEM9nl0Yb4rs/efgL65J3uRXrrKkvW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="337624432" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="337624432" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="956652066" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="956652066" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, alex.williamson@redhat.com, clg@redhat.com, david@redhat.com, philmd@linaro.org, kwankhede@nvidia.com, cjia@nvidia.com, yi.l.liu@intel.com, chao.p.peng@intel.com Subject: [PATCH v3 3/5] intel_iommu: Fix flag check in replay Date: Thu, 8 Jun 2023 17:52:29 +0800 Message-Id: <20230608095231.225450-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com> References: <20230608095231.225450-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=zhenzhong.duan@intel.com; helo=mga17.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686218808632100001 Content-Type: text/plain; charset="utf-8" Replay doesn't notify registered notifiers but the one passed to it. So it's meaningless to check the registered notifier's synthetic flag. There is no issue currently as all replay use cases have MAP flag set, but let's be robust. Signed-off-by: Zhenzhong Duan Reviewed-by: Peter Xu --- hw/i386/intel_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 34af12f392f5..f046f8591335 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3837,7 +3837,7 @@ static void vtd_iommu_replay(IOMMUMemoryRegion *iommu= _mr, IOMMUNotifier *n) PCI_FUNC(vtd_as->devfn), vtd_get_domain_id(s, &ce, vtd_as->pasid), ce.hi, ce.lo); - if (vtd_as_has_map_notifier(vtd_as)) { + if (n->notifier_flags & IOMMU_NOTIFIER_MAP) { /* This is required only for MAP typed notifiers */ vtd_page_walk_info info =3D { .hook_fn =3D vtd_replay_hook, --=20 2.34.1 From nobody Fri May 3 04:45:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686218813; cv=none; d=zohomail.com; s=zohoarc; b=bhZEe3j2/pqHzO8sI9N4JmWbDC+OgUM42jU+5ZHisryzTsQLKL6eZiRkppO2/68GF9vtutOndk7AW3AqQy45GgJ2WGBcIzXDZ+yUDYfAIw8+0gHlKLyNRMKFKUmsi+pngEZVJd0ckC2L44axBG/Y1luwTAkQBw4Q2NcYA/mh4tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686218813; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9F02mc/ozfDD2i7yaqPq/WIrovkQR8lMWFlfqr/5BBE=; b=c7PN61X3BMcxuq7+UH0PBR8aO/dbShii3gV2sY9AIELHBxOBk3e0ws0WrZefOZwSCUt4ytb6Oahq6fLqsI6iDoy0+xFX4srcezLLokEBKqA/BGs53uD3sbq6DvmyXuRyFLTrP0WYUA66peN2aAbk80vKW2U6yJvN4JrkEP/t8MY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686218813151459.8851820552094; Thu, 8 Jun 2023 03:06:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7CWi-0000A5-9H; Thu, 08 Jun 2023 06:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWT-00005a-6R for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:42 -0400 Received: from mga17.intel.com ([192.55.52.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWR-0007rz-ON for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:05:40 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:38 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686218739; x=1717754739; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4CgpPYVbeorcoGZpZNNOjXMIcZ32rq+ORgYJFTf1398=; b=EazVifGq4b0QNsmHJ6TV7ol219gQObl9uoTzWEIOJNn1lpAqAd1Tv7rf M8Blf7czpEAUNvPPTcF4CXgWz9SZk3BE189xv9gHpfzIkwfl3r++BLcaD nqQIM1nnnwPQMLvnW3iRLlL0y6OTlVHiPjfXn083xozJNpnXSfYgYU2V7 ogkNMQE2rBq0/uzvgRurlV7BOPokcXMDlu7UDnBM5Diur65qnT/vM4+97 OYd4K1JLP2EgKf558GKNZsP9OrmiIDJiWw2E2YdnpVMBjR7HgmkDzTLzu iSLenj7eGBGh3nF4Mxc9qSR9/prAOA2ukaib3ZlIMSpeomDE1Rp6jofXj Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="337624448" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="337624448" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="956652087" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="956652087" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, alex.williamson@redhat.com, clg@redhat.com, david@redhat.com, philmd@linaro.org, kwankhede@nvidia.com, cjia@nvidia.com, yi.l.liu@intel.com, chao.p.peng@intel.com Subject: [PATCH v3 4/5] intel_iommu: Fix address space unmap Date: Thu, 8 Jun 2023 17:52:30 +0800 Message-Id: <20230608095231.225450-5-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com> References: <20230608095231.225450-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=zhenzhong.duan@intel.com; helo=mga17.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686218814702100003 Content-Type: text/plain; charset="utf-8" During address space unmap, corresponding IOVA tree entries are also removed. But DMAMap is set beyond notifier's scope by 1, so in theory there is possibility to remove a continuous entry above the notifier's scope but falling in adjacent notifier's scope. There is no issue currently as no use cases allocate notifiers continuously, but let's be robust. Signed-off-by: Zhenzhong Duan Reviewed-by: Peter Xu --- hw/i386/intel_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index f046f8591335..dcc334060cd6 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3791,7 +3791,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *= as, IOMMUNotifier *n) n->start, size); =20 map.iova =3D n->start; - map.size =3D size; + map.size =3D size - 1; /* Inclusive */ iova_tree_remove(as->iova_tree, map); } =20 --=20 2.34.1 From nobody Fri May 3 04:45:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686218802; cv=none; d=zohomail.com; s=zohoarc; b=TLSWeIkwPr1iNZ9MZMxtvQ+U446FqP9wJ8qJM46aINyWVvvzRvsRzycbSQvUjqBAQP+hgjsZ6t/j4EXqF4kkc40y0gMYZRMB9ik05cggp+qUg07yTY3Z0bBXxfhqyru38fjk17V/zueC7KRfsgcQLfWzcZ7U814cNgpcCIm9vKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686218802; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9HqZU+IFI8hNQvKnzl2NviBjb4jjndzKCMukVcDF02A=; b=gazFiSOFO5ICBTCsK539ypAfECuPLfsDnirBGOWLNg36cKUlxK6QwLqiF4oZJrtOfrEHY9bS2Yd8tA7fMGIyPEciiWyxfPxHnHARZObEYWpy/X9rF3u8qJtUNhMYEONBmV7slNQ30i5YLuz32WFE17rJy/wK4ZY6pSZw7FBZ8A4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686218802839582.6514446055019; Thu, 8 Jun 2023 03:06:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7CWq-0000B5-Qo; Thu, 08 Jun 2023 06:06:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWp-0000Aw-EY for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:06:03 -0400 Received: from mga17.intel.com ([192.55.52.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7CWn-0007xy-Kr for qemu-devel@nongnu.org; Thu, 08 Jun 2023 06:06:03 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:42 -0700 Received: from duan-server-s2600bt.bj.intel.com ([10.240.192.147]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 03:05:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686218761; x=1717754761; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uB9cWQj7plvWmpBjyLlTfdsBwyWUSZdfHpu6QNZiArs=; b=fVZ1VWvwT2UR2R2zcAQQzFX4K1HSfSYmbmyljbgkEexEC3+057dGC0jU 6zZCXfa5JdCFYpf/8jejUtczD2k7ZZETi0330LYOc2QthOCXasf+uyVQV K7AMzsn1RlzjN3F8wNKaV/3sfyQifY8HXQRjSPE6gAhfJs23kyjjfZwlW TKYihUqKBM4lqPch3qNQy8+Oy6Rfr6YBoa99H04HDAdU1gOH5uFdPbGij XiBT5mrn4SSk9Y4NzN7oAWOjv5mTf3hEySuyfDN3cNryeUsSv4pKnnhkt Xh6lEjkD2Ull8JGlPSCPFSdSfgAMpW9JDwRu0N8hvQr60U7EgKUd7SxtM A==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="337624469" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="337624469" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="956652106" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="956652106" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, alex.williamson@redhat.com, clg@redhat.com, david@redhat.com, philmd@linaro.org, kwankhede@nvidia.com, cjia@nvidia.com, yi.l.liu@intel.com, chao.p.peng@intel.com Subject: [PATCH v3 5/5] intel_iommu: Optimize out some unnecessary UNMAP calls Date: Thu, 8 Jun 2023 17:52:31 +0800 Message-Id: <20230608095231.225450-6-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com> References: <20230608095231.225450-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=zhenzhong.duan@intel.com; helo=mga17.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686218804068100001 Content-Type: text/plain; charset="utf-8" Commit 63b88968f1 ("intel-iommu: rework the page walk logic") adds logic to record mapped IOVA ranges so we only need to send MAP or UNMAP when necessary. But there is still a corner case of unnecessary UNMAP. During invalidation, either domain or device selective, we only need to unmap when there are recorded mapped IOVA ranges, presuming most of OSes allocating IOVA range continuously, e.g. on x86, linux sets up mapping from 0xffffffff downwards. Strace shows UNMAP ioctl taking 0.000014us and we have 28 such ioctl() in one invalidation, as two notifiers in x86 are split into power of 2 pieces. ioctl(48, VFIO_IOMMU_UNMAP_DMA, 0x7ffffd5c42f0) =3D 0 <0.000014> The other purpose of this patch is to eliminate noisy error log when we work with IOMMUFD. It looks the duplicate UNMAP call will fail with IOMMUFD while always succeed with legacy container. This behavior difference leads to below error log for IOMMUFD: IOMMU_IOAS_UNMAP failed: No such file or directory vfio_container_dma_unmap(0x562012d6b6d0, 0x0, 0x80000000) =3D -2 (No such f= ile or directory) IOMMU_IOAS_UNMAP failed: No such file or directory vfio_container_dma_unmap(0x562012d6b6d0, 0x80000000, 0x40000000) =3D -2 (No= such file or directory) ... Suggested-by: Yi Liu Signed-off-by: Zhenzhong Duan --- hw/i386/intel_iommu.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index dcc334060cd6..9e5ba81c89e2 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3743,6 +3743,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *= as, IOMMUNotifier *n) hwaddr start =3D n->start; hwaddr end =3D n->end; IntelIOMMUState *s =3D as->iommu_state; + IOMMUTLBEvent event; DMAMap map; =20 /* @@ -3762,22 +3763,25 @@ static void vtd_address_space_unmap(VTDAddressSpace= *as, IOMMUNotifier *n) assert(start <=3D end); size =3D remain =3D end - start + 1; =20 + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &address_space_memory; + event.entry.perm =3D IOMMU_NONE; + /* This field is meaningless for unmap */ + event.entry.translated_addr =3D 0; + while (remain >=3D VTD_PAGE_SIZE) { - IOMMUTLBEvent event; uint64_t mask =3D dma_aligned_pow2_mask(start, end, s->aw_bits); uint64_t size =3D mask + 1; =20 assert(size); =20 - event.type =3D IOMMU_NOTIFIER_UNMAP; - event.entry.iova =3D start; - event.entry.addr_mask =3D mask; - event.entry.target_as =3D &address_space_memory; - event.entry.perm =3D IOMMU_NONE; - /* This field is meaningless for unmap */ - event.entry.translated_addr =3D 0; - - memory_region_notify_iommu_one(n, &event); + map.iova =3D start; + map.size =3D mask; + if (iova_tree_find(as->iova_tree, &map)) { + event.entry.iova =3D start; + event.entry.addr_mask =3D mask; + memory_region_notify_iommu_one(n, &event); + } =20 start +=3D size; remain -=3D size; --=20 2.34.1