[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/12] virtio-iommu: Consolidate host reserved regions and pro
From: |
Eric Auger |
Subject: |
[PATCH v2 10/12] virtio-iommu: Consolidate host reserved regions and property set ones |
Date: |
Wed, 13 Sep 2023 10:01:45 +0200 |
Up to now we were exposing to the RESV_MEM probe requests the
reserved memory regions set though the reserved-regions array property.
Combine those with the host reserved memory regions if any. Those
latter are tagged as RESERVED. We don't have more information about
them besides then cannot be mapped. Reserved regions set by
property have higher priority.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/virtio/virtio-iommu.c | 17 ++++++++++++++++-
hw/virtio/trace-events | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index ed2df5116f..4b22fe7ff1 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -21,6 +21,7 @@
#include "qemu/log.h"
#include "qemu/iov.h"
#include "qemu/range.h"
+#include "qemu/reserved-region.h"
#include "exec/target_page.h"
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio.h"
@@ -630,11 +631,25 @@ static int consolidate_resv_regions(IOMMUDevice *sdev)
VirtIOIOMMU *s = sdev->viommu;
int i;
+ /* First add host reserved regions if any, all tagged as RESERVED */
+ for (i = 0; i < sdev->nr_host_resv_regions; i++) {
+ ReservedRegion *reg = g_new0(ReservedRegion, 1);
+ reg->range = sdev->host_resv_regions[i];
+ reg->type = VIRTIO_IOMMU_RESV_MEM_T_RESERVED;
+ sdev->resv_regions = resv_region_list_insert(sdev->resv_regions, reg);
+ trace_virtio_iommu_host_resv_regions(sdev->iommu_mr.parent_obj.name, i,
+ range_lob(®->range),
+ range_upb(®->range));
+ }
+ /*
+ * then add higher priority reserved regions set through properties by the
+ * machine
+ */
for (i = 0; i < s->nr_prop_resv_regions; i++) {
ReservedRegion *reg = g_new0(ReservedRegion, 1);
*reg = s->prop_resv_regions[i];
- sdev->resv_regions = g_list_append(sdev->resv_regions, reg);
+ sdev->resv_regions = resv_region_list_insert(sdev->resv_regions, reg);
}
return 0;
}
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 7109cf1a3b..796574b0f3 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -134,6 +134,7 @@ virtio_iommu_notify_flag_add(const char *name) "add
notifier to mr %s"
virtio_iommu_notify_flag_del(const char *name) "del notifier from mr %s"
virtio_iommu_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool
on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
virtio_iommu_freeze_granule(uint64_t page_size_mask) "granule set to 0x%"PRIx64
+virtio_iommu_host_resv_regions(const char *name, uint32_t index, uint64_t lob,
uint64_t upb) "mr=%s host-resv-reg[%d] = [0x%"PRIx64",0x%"PRIx64"]"
# virtio-mem.c
virtio_mem_send_response(uint16_t type) "type=%" PRIu16
--
2.41.0
- [PATCH v2 05/12] virtio-iommu: Introduce per IOMMUDevice reserved regions, (continued)
- [PATCH v2 05/12] virtio-iommu: Introduce per IOMMUDevice reserved regions, Eric Auger, 2023/09/13
- [PATCH v2 06/12] range: Introduce range_inverse_array(), Eric Auger, 2023/09/13
- [PATCH v2 07/12] virtio-iommu: Implement set_iova_ranges() callback, Eric Auger, 2023/09/13
- [PATCH v2 08/12] range: Make range_compare() public, Eric Auger, 2023/09/13
- [PATCH v2 09/12] util/reserved-region: Add new ReservedRegion helpers, Eric Auger, 2023/09/13
- [PATCH v2 10/12] virtio-iommu: Consolidate host reserved regions and property set ones,
Eric Auger <=
- [PATCH v2 11/12] test: Add some tests for range and resv-mem helpers, Eric Auger, 2023/09/13
- [PATCH v2 12/12] vfio: Remove 64-bit IOVA address space assumption, Eric Auger, 2023/09/13
- Re: [PATCH v2 00/12] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space, YangHang Liu, 2023/09/26