From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Alex Williamson <alex.williamson@redhat.com>,
Eric Auger <eric.auger@redhat.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>
Subject: [PULL v3 22/31] vfio: Don't issue full 2^64 unmap
Date: Wed, 4 Nov 2020 13:42:19 -0500 [thread overview]
Message-ID: <20201104184040.285057-23-mst@redhat.com> (raw)
In-Reply-To: <20201104184040.285057-1-mst@redhat.com>
From: Jean-Philippe Brucker <jean-philippe@linaro.org>
IOMMUs may declare memory regions spanning from 0 to UINT64_MAX. When
attempting to deal with such region, vfio_listener_region_del() passes a
size of 2^64 to int128_get64() which throws an assertion failure. Even
ignoring this, the VFIO_IOMMU_DMA_MAP ioctl cannot handle this size
since the size field is 64-bit. Split the request in two.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Message-Id: <20201030180510.747225-11-jean-philippe@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/vfio/common.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 35895b18a6..c1fdbf17f2 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -950,6 +950,17 @@ static void vfio_listener_region_del(MemoryListener *listener,
}
if (try_unmap) {
+ if (int128_eq(llsize, int128_2_64())) {
+ /* The unmap ioctl doesn't accept a full 64-bit span. */
+ llsize = int128_rshift(llsize, 1);
+ ret = vfio_dma_unmap(container, iova, int128_get64(llsize), NULL);
+ if (ret) {
+ error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", "
+ "0x%"HWADDR_PRIx") = %d (%m)",
+ container, iova, int128_get64(llsize), ret);
+ }
+ iova += int128_get64(llsize);
+ }
ret = vfio_dma_unmap(container, iova, int128_get64(llsize), NULL);
if (ret) {
error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", "
--
MST
next prev parent reply other threads:[~2020-11-04 18:55 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 18:41 [PULL v3 00/31] pc,pci,vhost,virtio: fixes Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 01/31] pc: comment style fixup Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 02/31] virtio-mem: Make sure "addr" is always multiples of the block size Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 03/31] virtio-mem: Make sure "usable_region_size" " Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 04/31] virtio-mem: Probe THP size to determine default " Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 05/31] memory-device: Support big alignment requirements Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 06/31] memory-device: Add get_min_alignment() callback Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 07/31] virito-mem: Implement get_min_alignment() Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 08/31] hw/acpi : Don't use '#' flag of printf format Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 09/31] hw/acpi : add space before the open parenthesis '(' Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 10/31] hw/acpi : add spaces around operator Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 11/31] hw/virtio/vhost-backend: Fix Coverity CID 1432871 Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 12/31] hw/smbios: Fix leaked fd in save_opt_one() error path Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 13/31] virtio-iommu: Fix virtio_iommu_mr() Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 14/31] virtio-iommu: Store memory region in endpoint struct Michael S. Tsirkin
2020-11-04 18:41 ` [PULL v3 15/31] virtio-iommu: Add memory notifiers for map/unmap Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 16/31] virtio-iommu: Call memory notifiers in attach/detach Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 17/31] virtio-iommu: Add replay() memory region callback Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 18/31] virtio-iommu: Add notify_flag_changed() " Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 19/31] memory: Add interface to set iommu page size mask Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 20/31] vfio: Set IOMMU page size as per host supported page size Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 21/31] virtio-iommu: Set supported page size mask Michael S. Tsirkin
2020-11-04 18:42 ` Michael S. Tsirkin [this message]
2020-11-04 18:42 ` [PULL v3 23/31] vhost-vdpa: Add qemu_close in vhost_vdpa_cleanup Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 24/31] net: Add vhost-vdpa in show_netdevs() Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 25/31] Revert "vhost-blk: set features before setting inflight feature" Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 26/31] vhost-blk: set features before setting inflight feature Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 27/31] libvhost-user: follow QEMU comment style Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 28/31] configure: introduce --enable-vhost-user-blk-server Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 29/31] block/export: make vhost-user-blk config space little-endian Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 30/31] block/export: fix vhost-user-blk get_config() information leak Michael S. Tsirkin
2020-11-04 18:42 ` [PULL v3 31/31] contrib/vhost-user-blk: fix " Michael S. Tsirkin
2020-11-05 16:14 ` [PULL v3 00/31] pc,pci,vhost,virtio: fixes Peter Maydell
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=20201104184040.285057-23-mst@redhat.com \
--to=mst@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=jean-philippe@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).