From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
alex.williamson@redhat.com, clg@redhat.com,
jean-philippe@linaro.org, mst@redhat.com, pbonzini@redhat.com
Cc: peter.maydell@linaro.org, peterx@redhat.com, david@redhat.com,
philmd@linaro.org
Subject: [PATCH 07/13] virtio-iommu: Implement set_iova_ranges() callback
Date: Mon, 4 Sep 2023 10:03:50 +0200 [thread overview]
Message-ID: <20230904080451.424731-8-eric.auger@redhat.com> (raw)
In-Reply-To: <20230904080451.424731-1-eric.auger@redhat.com>
The implementation populates the array of per IOMMUDevice
host reserved regions.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
include/hw/virtio/virtio-iommu.h | 2 ++
hw/virtio/virtio-iommu.c | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h
index 70b8ace34d..31b69c8261 100644
--- a/include/hw/virtio/virtio-iommu.h
+++ b/include/hw/virtio/virtio-iommu.h
@@ -40,6 +40,8 @@ typedef struct IOMMUDevice {
MemoryRegion root; /* The root container of the device */
MemoryRegion bypass_mr; /* The alias of shared memory MR */
GList *resv_regions;
+ Range *host_resv_regions;
+ uint32_t nr_host_resv_regions;
} IOMMUDevice;
typedef struct IOMMUPciBus {
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index ea359b586a..02f1a59d57 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/iov.h"
+#include "qemu/range.h"
#include "exec/target_page.h"
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio.h"
@@ -1158,6 +1159,21 @@ static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
return 0;
}
+static int virtio_iommu_set_iova_ranges(IOMMUMemoryRegion *mr,
+ uint32_t nr_ranges,
+ struct Range *iova_ranges,
+ Error **errp)
+{
+ IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
+ assert(nr_ranges);
+
+
+ range_inverse_array(nr_ranges, iova_ranges,
+ &sdev->nr_host_resv_regions, &sdev->host_resv_regions);
+
+ return 0;
+}
+
static void virtio_iommu_system_reset(void *opaque)
{
VirtIOIOMMU *s = opaque;
@@ -1453,6 +1469,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass,
imrc->replay = virtio_iommu_replay;
imrc->notify_flag_changed = virtio_iommu_notify_flag_changed;
imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask;
+ imrc->iommu_set_iova_ranges = virtio_iommu_set_iova_ranges;
}
static const TypeInfo virtio_iommu_info = {
--
2.41.0
next prev parent reply other threads:[~2023-09-04 8:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 8:03 [PATCH 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space Eric Auger
2023-09-04 8:03 ` [PATCH 01/13] memory: Let ReservedRegion use Range Eric Auger
2023-09-04 8:12 ` Philippe Mathieu-Daudé
2023-09-04 14:22 ` Eric Auger
2023-09-06 7:17 ` David Hildenbrand
2023-09-11 18:40 ` Peter Xu
2023-09-04 8:03 ` [PATCH 02/13] memory: Introduce memory_region_iommu_set_iova_ranges Eric Auger
2023-09-11 18:41 ` Peter Xu
2023-09-14 13:38 ` David Hildenbrand
2023-09-04 8:03 ` [PATCH 03/13] vfio: Collect container iova range info Eric Auger
2023-09-04 8:03 ` [PATCH 04/13] virtio-iommu: Rename reserved_regions into prop_resv_regions Eric Auger
2023-09-04 8:03 ` [PATCH 05/13] virtio-iommu: Introduce per IOMMUDevice reserved regions Eric Auger
2023-09-04 8:03 ` [PATCH 06/13] range: Introduce range_inverse_array() Eric Auger
2023-09-04 8:18 ` Philippe Mathieu-Daudé
2023-09-04 14:21 ` Eric Auger
2023-09-04 8:03 ` Eric Auger [this message]
2023-09-04 8:03 ` [PATCH 08/13] range: Make range_compare() public Eric Auger
2023-09-04 8:19 ` Philippe Mathieu-Daudé
2023-09-04 8:03 ` [PATCH 09/13] util/reserved-region: Add new ReservedRegion helpers Eric Auger
2023-09-04 8:03 ` [PATCH 10/13] virtio-iommu: Consolidate host reserved regions and property set ones Eric Auger
2023-09-04 8:03 ` [PATCH 11/13] test: Add some tests for range and resv-mem helpers Eric Auger
2023-09-04 8:03 ` [PATCH 12/13] virtio-iommu: Resize memory region according to the max iova info Eric Auger
2023-09-04 8:21 ` Philippe Mathieu-Daudé
2023-09-04 8:03 ` [PATCH 13/13] vfio: Remove 64-bit IOVA address space assumption Eric Auger
2023-09-05 8:22 ` [PATCH 00/13] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space YangHang Liu
2023-09-05 9:15 ` Eric Auger
2023-09-05 9:50 ` Eric Auger
2023-09-05 17:55 ` Alex Williamson
2023-09-06 6:40 ` Eric Auger
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=20230904080451.424731-8-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=clg@redhat.com \
--cc=david@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe@linaro.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.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).