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 7/9] virtio-iommu: add iommu replay
Date: Mon, 23 Mar 2020 14:16:15 +0530 [thread overview]
Message-ID: <20200323084617.1782-8-bbhushan2@marvell.com> (raw)
In-Reply-To: <20200323084617.1782-1-bbhushan2@marvell.com>
Default replay does not work with virtio-iommu,
so this patch provide virtio-iommu replay functionality.
Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com>
---
hw/virtio/virtio-iommu.c | 44 ++++++++++++++++++++++++++++++++++++++++
hw/virtio/trace-events | 1 +
2 files changed, 45 insertions(+)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 88849aa7b9..747e3cf1da 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -770,6 +770,49 @@ static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
sdev->page_size_mask = page_size_mask;
}
+static gboolean virtio_iommu_remap(gpointer key, gpointer value, gpointer data)
+{
+ VirtIOIOMMUMapping *mapping = (VirtIOIOMMUMapping *) value;
+ VirtIOIOMMUInterval *interval = (VirtIOIOMMUInterval *) key;
+ IOMMUMemoryRegion *mr = (IOMMUMemoryRegion *) data;
+
+ trace_virtio_iommu_remap(interval->low, mapping->phys_addr,
+ interval->high - interval->low + 1);
+ /* unmap previous entry and map again */
+ virtio_iommu_notify_unmap(mr, interval->low,
+ interval->high - interval->low + 1);
+
+ virtio_iommu_notify_map(mr, interval->low, mapping->phys_addr,
+ interval->high - interval->low + 1);
+ return false;
+}
+
+static void virtio_iommu_replay(IOMMUMemoryRegion *mr, IOMMUNotifier *n)
+{
+ IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
+ VirtIOIOMMU *s = sdev->viommu;
+ uint32_t sid;
+ VirtIOIOMMUEndpoint *ep;
+
+ sid = virtio_iommu_get_bdf(sdev);
+
+ qemu_mutex_lock(&s->mutex);
+
+ if (!s->endpoints) {
+ goto unlock;
+ }
+
+ ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(sid));
+ if (!ep || !ep->domain) {
+ goto unlock;
+ }
+
+ g_tree_foreach(ep->domain->mappings, virtio_iommu_remap, mr);
+
+unlock:
+ qemu_mutex_unlock(&s->mutex);
+}
+
static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -988,6 +1031,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass,
imrc->translate = virtio_iommu_translate;
imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask;
+ imrc->replay = virtio_iommu_replay;
}
static const TypeInfo virtio_iommu_info = {
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index d94a1cd8a3..8bae651191 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -75,3 +75,4 @@ virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid)
virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64
virtio_iommu_notify_map(const char *name, uint64_t iova, uint64_t paddr, uint64_t map_size) "mr=%s iova=0x%"PRIx64" pa=0x%" PRIx64" size=0x%"PRIx64
virtio_iommu_notify_unmap(const char *name, uint64_t iova, uint64_t map_size) "mr=%s iova=0x%"PRIx64" size=0x%"PRIx64
+virtio_iommu_remap(uint64_t iova, uint64_t pa, uint64_t size) "iova=0x%"PRIx64" pa=0x%" PRIx64" size=0x%"PRIx64""
--
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 ` [PATCH v9 6/9] virtio-iommu: Call iommu notifier for attach/detach Bharat Bhushan
2020-03-23 8:46 ` Bharat Bhushan [this message]
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-8-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).