From: Bharat Bhushan <bbhushan2@marvell.com>
To: <peter.maydell@linaro.org>, <peterx@redhat.com>,
<eric.auger.pro@gmail.com>, <alex.williamson@redhat.com>,
<kevin.tian@intel.com>, <mst@redhat.com>, <tnowicki@marvell.com>,
<drjones@redhat.com>, <linuc.decode@gmail.com>,
<qemu-devel@nongnu.org>, <qemu-arm@nongnu.org>,
<bharatb.linux@gmail.com>, <jean-philippe@linaro.org>,
<yang.zhong@intel.com>
Cc: Bharat Bhushan <bbhushan2@marvell.com>
Subject: [PATCH v9 6/9] virtio-iommu: Call iommu notifier for attach/detach
Date: Mon, 23 Mar 2020 14:16:14 +0530 [thread overview]
Message-ID: <20200323084617.1782-7-bbhushan2@marvell.com> (raw)
In-Reply-To: <20200323084617.1782-1-bbhushan2@marvell.com>
iommu-notifier are called when a device is attached
or detached to as address-space.
This is needed for VFIO.
Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com>
---
hw/virtio/virtio-iommu.c | 49 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index bd464d4fb3..88849aa7b9 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -49,6 +49,7 @@ typedef struct VirtIOIOMMUEndpoint {
uint32_t id;
VirtIOIOMMUDomain *domain;
QLIST_ENTRY(VirtIOIOMMUEndpoint) next;
+ VirtIOIOMMU *viommu;
} VirtIOIOMMUEndpoint;
typedef struct VirtIOIOMMUInterval {
@@ -155,11 +156,48 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegion *mr, hwaddr iova,
memory_region_notify_iommu(mr, 0, entry);
}
+static gboolean virtio_iommu_mapping_unmap(gpointer key, gpointer value,
+ gpointer data)
+{
+ VirtIOIOMMUInterval *interval = (VirtIOIOMMUInterval *) key;
+ IOMMUMemoryRegion *mr = (IOMMUMemoryRegion *) data;
+
+ virtio_iommu_notify_unmap(mr, interval->low,
+ interval->high - interval->low + 1);
+
+ return false;
+}
+
+static gboolean virtio_iommu_mapping_map(gpointer key, gpointer value,
+ gpointer data)
+{
+ VirtIOIOMMUMapping *mapping = (VirtIOIOMMUMapping *) value;
+ VirtIOIOMMUInterval *interval = (VirtIOIOMMUInterval *) key;
+ IOMMUMemoryRegion *mr = (IOMMUMemoryRegion *) data;
+
+ virtio_iommu_notify_map(mr, interval->low, mapping->phys_addr,
+ interval->high - interval->low + 1);
+
+ return false;
+}
+
static void virtio_iommu_detach_endpoint_from_domain(VirtIOIOMMUEndpoint *ep)
{
+ VirtIOIOMMU *s = ep->viommu;
+ VirtIOIOMMUDomain *domain = ep->domain;
+ IOMMUDevice *sdev;
+
if (!ep->domain) {
return;
}
+
+ QLIST_FOREACH(sdev, &s->notifiers_list, next) {
+ if (ep->id == sdev->devfn) {
+ g_tree_foreach(domain->mappings, virtio_iommu_mapping_unmap,
+ &sdev->iommu_mr);
+ }
+ }
+
QLIST_REMOVE(ep, next);
ep->domain = NULL;
}
@@ -178,6 +216,7 @@ static VirtIOIOMMUEndpoint *virtio_iommu_get_endpoint(VirtIOIOMMU *s,
}
ep = g_malloc0(sizeof(*ep));
ep->id = ep_id;
+ ep->viommu = s;
trace_virtio_iommu_get_endpoint(ep_id);
g_tree_insert(s->endpoints, GUINT_TO_POINTER(ep_id), ep);
return ep;
@@ -274,6 +313,7 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,
uint32_t ep_id = le32_to_cpu(req->endpoint);
VirtIOIOMMUDomain *domain;
VirtIOIOMMUEndpoint *ep;
+ IOMMUDevice *sdev;
trace_virtio_iommu_attach(domain_id, ep_id);
@@ -299,6 +339,14 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,
ep->domain = domain;
+ /* Replay domain mappings on the associated memory region */
+ QLIST_FOREACH(sdev, &s->notifiers_list, next) {
+ if (ep_id == sdev->devfn) {
+ g_tree_foreach(domain->mappings, virtio_iommu_mapping_map,
+ &sdev->iommu_mr);
+ }
+ }
+
return VIRTIO_IOMMU_S_OK;
}
@@ -872,6 +920,7 @@ static gboolean reconstruct_endpoints(gpointer key, gpointer value,
QLIST_FOREACH(iter, &d->endpoint_list, next) {
iter->domain = d;
+ iter->viommu = s;
g_tree_insert(s->endpoints, GUINT_TO_POINTER(iter->id), iter);
}
return false; /* continue the domain traversal */
--
2.17.1
next prev parent reply other threads:[~2020-03-23 8:52 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 8:46 [PATCH v9 0/9] virtio-iommu: VFIO integration Bharat Bhushan
2020-03-23 8:46 ` [PATCH v9 1/9] hw/vfio/common: Remove error print on mmio region translation by viommu Bharat Bhushan
2020-03-23 23:08 ` Alex Williamson
2020-03-26 17:35 ` Auger Eric
2020-03-26 17:53 ` Alex Williamson
2020-03-27 5:50 ` [EXT] " Bharat Bhushan
2020-04-02 9:01 ` Bharat Bhushan
2020-04-24 14:17 ` Auger Eric
2020-05-05 9:25 ` Bharat Bhushan
2020-05-05 9:30 ` Auger Eric
2020-05-05 9:46 ` Bharat Bhushan
2020-05-05 10:18 ` Bharat Bhushan
2020-05-05 12:05 ` Auger Eric
2020-05-07 14:40 ` Auger Eric
2020-03-23 8:46 ` [PATCH v9 2/9] memory: Add interface to set iommu page size mask Bharat Bhushan
2020-03-26 16:06 ` Auger Eric
2020-03-27 5:33 ` [EXT] " Bharat Bhushan
2020-03-27 8:27 ` Auger Eric
2020-03-23 8:46 ` [PATCH v9 3/9] vfio: set iommu page size as per host supported page size Bharat Bhushan
2020-03-23 8:46 ` [PATCH v9 4/9] virtio-iommu: set supported page size mask Bharat Bhushan
2020-03-26 15:51 ` Auger Eric
2020-03-27 5:13 ` [EXT] " Bharat Bhushan
2020-03-27 8:28 ` Auger Eric
2020-03-23 8:46 ` [PATCH v9 5/9] virtio-iommu: Add iommu notifier for map/unmap Bharat Bhushan
2020-03-23 8:46 ` Bharat Bhushan [this message]
2020-03-23 8:46 ` [PATCH v9 7/9] virtio-iommu: add iommu replay Bharat Bhushan
2020-03-23 8:46 ` [PATCH v9 8/9] virtio-iommu: Implement probe request Bharat Bhushan
2020-03-26 15:48 ` Auger Eric
2020-03-27 5:40 ` [EXT] " Bharat Bhushan
2020-03-27 8:34 ` Auger Eric
2020-04-23 16:09 ` Jean-Philippe Brucker
2020-04-24 13:51 ` Auger Eric
2020-05-05 9:06 ` Bharat Bhushan
2020-05-07 14:42 ` Auger Eric
2020-03-23 8:46 ` [PATCH v9 9/9] virtio-iommu: add iommu notifier memory-region Bharat Bhushan
2020-03-23 9:52 ` [PATCH v9 0/9] virtio-iommu: VFIO integration no-reply
2020-03-23 9:59 ` no-reply
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=20200323084617.1782-7-bbhushan2@marvell.com \
--to=bbhushan2@marvell.com \
--cc=alex.williamson@redhat.com \
--cc=bharatb.linux@gmail.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe@linaro.org \
--cc=kevin.tian@intel.com \
--cc=linuc.decode@gmail.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tnowicki@marvell.com \
--cc=yang.zhong@intel.com \
/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).