From: Zhenzhong Duan <zhenzhong.duan@intel.com>
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 [thread overview]
Message-ID: <20230608095231.225450-6-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20230608095231.225450-1-zhenzhong.duan@intel.com>
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) = 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) = -2 (No such file or directory)
IOMMU_IOAS_UNMAP failed: No such file or directory
vfio_container_dma_unmap(0x562012d6b6d0, 0x80000000, 0x40000000) = -2 (No such file or directory)
...
Suggested-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
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 = n->start;
hwaddr end = n->end;
IntelIOMMUState *s = as->iommu_state;
+ IOMMUTLBEvent event;
DMAMap map;
/*
@@ -3762,22 +3763,25 @@ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n)
assert(start <= end);
size = remain = end - start + 1;
+ event.type = IOMMU_NOTIFIER_UNMAP;
+ event.entry.target_as = &address_space_memory;
+ event.entry.perm = IOMMU_NONE;
+ /* This field is meaningless for unmap */
+ event.entry.translated_addr = 0;
+
while (remain >= VTD_PAGE_SIZE) {
- IOMMUTLBEvent event;
uint64_t mask = dma_aligned_pow2_mask(start, end, s->aw_bits);
uint64_t size = mask + 1;
assert(size);
- event.type = IOMMU_NOTIFIER_UNMAP;
- event.entry.iova = start;
- event.entry.addr_mask = mask;
- event.entry.target_as = &address_space_memory;
- event.entry.perm = IOMMU_NONE;
- /* This field is meaningless for unmap */
- event.entry.translated_addr = 0;
-
- memory_region_notify_iommu_one(n, &event);
+ map.iova = start;
+ map.size = mask;
+ if (iova_tree_find(as->iova_tree, &map)) {
+ event.entry.iova = start;
+ event.entry.addr_mask = mask;
+ memory_region_notify_iommu_one(n, &event);
+ }
start += size;
remain -= size;
--
2.34.1
next prev parent reply other threads:[~2023-06-08 10:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-08 9:52 [PATCH v3 0/5] Optimize UNMAP call and bug fix Zhenzhong Duan
2023-06-08 9:52 ` [PATCH v3 1/5] util: Add iova_tree_foreach_range_data Zhenzhong Duan
2023-06-08 9:52 ` [PATCH v3 2/5] intel_iommu: Fix a potential issue in VFIO dirty page sync Zhenzhong Duan
2023-06-08 13:42 ` Peter Xu
2023-06-08 9:52 ` [PATCH v3 3/5] intel_iommu: Fix flag check in replay Zhenzhong Duan
2023-06-08 13:43 ` Peter Xu
2023-06-08 9:52 ` [PATCH v3 4/5] intel_iommu: Fix address space unmap Zhenzhong Duan
2023-06-08 13:48 ` Peter Xu
2023-06-09 3:31 ` Duan, Zhenzhong
2023-06-09 13:36 ` Peter Xu
2023-06-13 2:32 ` Duan, Zhenzhong
2023-06-08 9:52 ` Zhenzhong Duan [this message]
2023-06-08 14:05 ` [PATCH v3 5/5] intel_iommu: Optimize out some unnecessary UNMAP calls Peter Xu
2023-06-08 14:11 ` Jason Gunthorpe
2023-06-08 15:40 ` Peter Xu
2023-06-08 16:27 ` Jason Gunthorpe
2023-06-08 19:53 ` Peter Xu
2023-06-09 1:00 ` Jason Gunthorpe
2023-06-09 5:49 ` Duan, Zhenzhong
2023-06-09 21:26 ` Peter Xu
2023-06-13 2:37 ` Duan, Zhenzhong
2023-06-14 9:47 ` Duan, Zhenzhong
2023-06-09 4:03 ` Duan, Zhenzhong
2023-06-09 3:41 ` Duan, Zhenzhong
2023-06-08 20:34 ` Peter Xu
2023-06-09 4:01 ` Duan, Zhenzhong
2023-06-14 9:38 ` Duan, Zhenzhong
2023-06-14 12:51 ` Peter Xu
2023-06-08 15:53 ` [PATCH v3 0/5] Optimize UNMAP call and bug fix Peter Xu
2023-06-09 3:32 ` Duan, Zhenzhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230608095231.225450-6-zhenzhong.duan@intel.com \
--to=zhenzhong.duan@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=cjia@nvidia.com \
--cc=clg@redhat.com \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=jasowang@redhat.com \
--cc=kwankhede@nvidia.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=yi.l.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).