[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 02/10] virtio-iommu: Store memory region in endpoint struct
From: |
Jean-Philippe Brucker |
Subject: |
[PATCH v10 02/10] virtio-iommu: Store memory region in endpoint struct |
Date: |
Thu, 8 Oct 2020 19:15:50 +0200 |
Store the memory region associated to each endpoint into the endpoint
structure, to allow efficient memory notification on map/unmap.
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
Not super confident about the reconstruct_endpoint() change since I
haven't tested migration yet. Does it make sense?
---
hw/virtio/virtio-iommu.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 543fbbb24fb..33115e82186 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -49,6 +49,7 @@ typedef struct VirtIOIOMMUDomain {
typedef struct VirtIOIOMMUEndpoint {
uint32_t id;
VirtIOIOMMUDomain *domain;
+ IOMMUMemoryRegion *iommu_mr;
QLIST_ENTRY(VirtIOIOMMUEndpoint) next;
} VirtIOIOMMUEndpoint;
@@ -137,16 +138,19 @@ static VirtIOIOMMUEndpoint
*virtio_iommu_get_endpoint(VirtIOIOMMU *s,
uint32_t ep_id)
{
VirtIOIOMMUEndpoint *ep;
+ IOMMUMemoryRegion *mr;
ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(ep_id));
if (ep) {
return ep;
}
- if (!virtio_iommu_mr(s, ep_id)) {
+ mr = virtio_iommu_mr(s, ep_id);
+ if (!mr) {
return NULL;
}
ep = g_malloc0(sizeof(*ep));
ep->id = ep_id;
+ ep->iommu_mr = mr;
trace_virtio_iommu_get_endpoint(ep_id);
g_tree_insert(s->endpoints, GUINT_TO_POINTER(ep_id), ep);
return ep;
@@ -927,9 +931,14 @@ static gboolean reconstruct_endpoints(gpointer key,
gpointer value,
VirtIOIOMMU *s = (VirtIOIOMMU *)data;
VirtIOIOMMUDomain *d = (VirtIOIOMMUDomain *)value;
VirtIOIOMMUEndpoint *iter;
+ IOMMUMemoryRegion *mr;
QLIST_FOREACH(iter, &d->endpoint_list, next) {
+ mr = virtio_iommu_mr(s, iter->id);
+ assert(mr);
+
iter->domain = d;
+ iter->iommu_mr = mr;
g_tree_insert(s->endpoints, GUINT_TO_POINTER(iter->id), iter);
}
return false; /* continue the domain traversal */
--
2.28.0
- [PATCH v10 00/10] virtio-iommu: VFIO integration, Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 01/10] virtio-iommu: Fix virtio_iommu_mr(), Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 04/10] virtio-iommu: Call memory notifiers in attach/detach, Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 02/10] virtio-iommu: Store memory region in endpoint struct,
Jean-Philippe Brucker <=
- [PATCH v10 03/10] virtio-iommu: Add memory notifiers for map/unmap, Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 05/10] virtio-iommu: Add replay() memory region callback, Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 06/10] virtio-iommu: Add notify_flag_changed() memory region callback, Jean-Philippe Brucker, 2020/10/08
- [PATCH v10 07/10] memory: Add interface to set iommu page size mask, Jean-Philippe Brucker, 2020/10/08