[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/13] vfio: Remove 64-bit IOVA address space assumption
From: |
Eric Auger |
Subject: |
[PATCH 13/13] vfio: Remove 64-bit IOVA address space assumption |
Date: |
Mon, 4 Sep 2023 10:03:56 +0200 |
Now we retrieve the usable IOVA ranges from the host,
let's remove the assumption of 64b IOVA space when calling
vfio_host_win_add().
Make sure the vfio_find_hostwin() gets called after we get
a chance to call set_iova_regions and resize the IOMMU MR
according to the actual physical GAW.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/vfio/common.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 26da38de05..40cac1ca91 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1112,13 +1112,6 @@ static void vfio_listener_region_add(MemoryListener
*listener,
#endif
}
- hostwin = vfio_find_hostwin(container, iova, end);
- if (!hostwin) {
- error_setg(&err, "Container %p can't map guest IOVA region"
- " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova, end);
- goto fail;
- }
-
memory_region_ref(section->mr);
if (memory_region_is_iommu(section->mr)) {
@@ -1177,6 +1170,14 @@ static void vfio_listener_region_add(MemoryListener
*listener,
return;
}
+ hostwin = vfio_find_hostwin(container, iova, end);
+ if (!hostwin) {
+ error_setg(&err, "Container %p can't map guest IOVA region"
+ " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova, end);
+ goto fail;
+ }
+
+
/* Here we assume that memory_region_is_ram(section->mr)==true */
/*
@@ -2594,12 +2595,10 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as,
vfio_get_iommu_info_migration(container, info);
g_free(info);
- /*
- * FIXME: We should parse VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE
- * information to get the actual window extent rather than assume
- * a 64-bit IOVA address space.
- */
- vfio_host_win_add(container, 0, (hwaddr)-1, container->pgsizes);
+ g_assert(container->nr_iovas);
+ vfio_host_win_add(container, 0,
+ container->iova_ranges[container->nr_iovas - 1].end,
+ container->pgsizes);
break;
}
--
2.41.0
- Re: [PATCH 02/13] memory: Introduce memory_region_iommu_set_iova_ranges, (continued)
- [PATCH 04/13] virtio-iommu: Rename reserved_regions into prop_resv_regions, Eric Auger, 2023/09/04
- [PATCH 03/13] vfio: Collect container iova range info, Eric Auger, 2023/09/04
- [PATCH 05/13] virtio-iommu: Introduce per IOMMUDevice reserved regions, Eric Auger, 2023/09/04
- [PATCH 06/13] range: Introduce range_inverse_array(), Eric Auger, 2023/09/04
- [PATCH 09/13] util/reserved-region: Add new ReservedRegion helpers, Eric Auger, 2023/09/04
- [PATCH 07/13] virtio-iommu: Implement set_iova_ranges() callback, Eric Auger, 2023/09/04
- [PATCH 11/13] test: Add some tests for range and resv-mem helpers, Eric Auger, 2023/09/04
- [PATCH 13/13] vfio: Remove 64-bit IOVA address space assumption,
Eric Auger <=
- [PATCH 08/13] range: Make range_compare() public, Eric Auger, 2023/09/04
- [PATCH 12/13] virtio-iommu: Resize memory region according to the max iova info, Eric Auger, 2023/09/04
- [PATCH 10/13] virtio-iommu: Consolidate host reserved regions and property set ones, Eric Auger, 2023/09/04
- Re: [PATCH 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space, YangHang Liu, 2023/09/05
- Re: [PATCH 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space, Alex Williamson, 2023/09/05