From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S . Tsirkin" <mst@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>,
yi.l.liu@intel.com, Marcel Apfelbaum <marcel@redhat.com>,
Lan Tianyu <tianyu.lan@intel.com>,
peterx@redhat.com, Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PATCH v4 10/10] vhost: iommu: cache static mapping if there is
Date: Fri, 19 May 2017 11:19:49 +0800 [thread overview]
Message-ID: <1495163989-9994-11-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1495163989-9994-1-git-send-email-peterx@redhat.com>
This patch pre-heat vhost iotlb cache when passthrough mode enabled.
Sometimes, even if user specified iommu_platform for vhost devices,
IOMMU might still be disabled. One case is passthrough mode in VT-d
implementation. We can detect this by observing iommu_list. If it's
empty, it means IOMMU translation is disabled, then we can actually
pre-heat the translation (it'll be static mapping then) by first
invalidating all IOTLB, then cache existing memory ranges into vhost
backend iotlb using 1:1 mapping.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
hw/virtio/trace-events | 4 ++++
hw/virtio/vhost.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 1f7a7c1..54dcbb3 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -24,3 +24,7 @@ virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s g
virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d actual: %d"
virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d"
virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: %"PRIx64" num_pages: %d"
+
+# hw/virtio/vhost.c
+vhost_iommu_commit(void) ""
+vhost_iommu_static_preheat(void) ""
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 03a46a7..8069135 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -27,6 +27,7 @@
#include "hw/virtio/virtio-access.h"
#include "migration/blocker.h"
#include "sysemu/dma.h"
+#include "trace.h"
/* enabled until disconnected backend stabilizes */
#define _VHOST_DEBUG 1
@@ -730,6 +731,11 @@ static void vhost_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
}
}
+static bool vhost_iommu_mr_enabled(struct vhost_dev *dev)
+{
+ return !QLIST_EMPTY(&dev->iommu_list);
+}
+
static void vhost_iommu_region_add(MemoryListener *listener,
MemoryRegionSection *section)
{
@@ -782,6 +788,48 @@ static void vhost_iommu_region_del(MemoryListener *listener,
}
}
+static void vhost_iommu_commit(MemoryListener *listener)
+{
+ struct vhost_dev *dev = container_of(listener, struct vhost_dev,
+ iommu_listener);
+ struct vhost_memory_region *r;
+ int i;
+
+ trace_vhost_iommu_commit();
+
+ if (!vhost_iommu_mr_enabled(dev)) {
+ /*
+ * This means iommu_platform is enabled, however iommu memory
+ * region is disabled, e.g., when device passthrough is setup.
+ * Then, no translation is needed any more.
+ *
+ * Let's first invalidate the whole IOTLB, then pre-heat the
+ * static mapping by looping over vhost memory ranges.
+ */
+
+ if (dev->vhost_ops->vhost_invalidate_device_iotlb(dev, 0,
+ UINT64_MAX)) {
+ error_report("%s: flush existing IOTLB failed", __func__);
+ return;
+ }
+
+ for (i = 0; i < dev->mem->nregions; i++) {
+ r = &dev->mem->regions[i];
+ /* Vhost regions are writable RAM, so IOMMU_RW suites. */
+ if (dev->vhost_ops->vhost_update_device_iotlb(dev,
+ r->guest_phys_addr,
+ r->userspace_addr,
+ r->memory_size,
+ IOMMU_RW)) {
+ error_report("%s: pre-heat static mapping failed", __func__);
+ return;
+ }
+ }
+
+ trace_vhost_iommu_static_preheat();
+ }
+}
+
static void vhost_region_nop(MemoryListener *listener,
MemoryRegionSection *section)
{
@@ -1298,6 +1346,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
hdev->iommu_listener = (MemoryListener) {
.region_add = vhost_iommu_region_add,
.region_del = vhost_iommu_region_del,
+ .commit = vhost_iommu_commit,
};
if (hdev->migration_blocker == NULL) {
--
2.7.4
next prev parent reply other threads:[~2017-05-19 3:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 3:19 [Qemu-devel] [PATCH v4 00/10] VT-d: PT (passthrough) mode support and misc fixes Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 01/10] memory: tune last param of iommu_ops.translate() Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 02/10] memory: remove the last param in memory_region_iommu_replay() Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 03/10] x86-iommu: use DeviceClass properties Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 04/10] intel_iommu: renaming context entry helpers Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 05/10] intel_iommu: provide vtd_ce_get_type() Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 06/10] intel_iommu: use IOMMU_ACCESS_FLAG() Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 07/10] intel_iommu: allow dev-iotlb context entry conditionally Peter Xu
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 08/10] intel_iommu: support passthrough (PT) Peter Xu
2017-05-25 10:40 ` Liu, Yi L
2017-05-19 3:19 ` [Qemu-devel] [PATCH v4 09/10] intel_iommu: turn off pt before 2.9 Peter Xu
2017-05-19 3:19 ` Peter Xu [this message]
2017-05-19 16:55 ` [Qemu-devel] [PATCH v4 10/10] vhost: iommu: cache static mapping if there is Michael S. Tsirkin
2017-05-22 2:30 ` Jason Wang
2017-05-22 2:42 ` Peter Xu
2017-05-25 18:14 ` Michael S. Tsirkin
2017-05-29 4:29 ` Peter Xu
2017-05-25 8:16 ` [Qemu-devel] [PATCH v4 00/10] VT-d: PT (passthrough) mode support and misc fixes Jason Wang
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=1495163989-9994-11-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=jasowang@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=tianyu.lan@intel.com \
--cc=yi.l.liu@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).