All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH RFC] fixup! virtio: convert to use DMA api
@ 2016-04-18 11:47 ` Michael S. Tsirkin
  0 siblings, 0 replies; 97+ messages in thread
From: Michael S. Tsirkin @ 2016-04-18 11:47 UTC (permalink / raw)
  To: qemu-devel, linux-kernel
  Cc: pbonzini, peterx, cornelia.huck, Stefan Hajnoczi, Kevin Wolf,
	Amit Shah, qemu-block, Jason Wang, Alex Williamson,
	Andy Lutomirski, Christian Borntraeger, Wei Liu, David Woodhouse,
	virtualization, kvm

This adds a flag to enable/disable bypassing the IOMMU by
virtio devices.

This is on top of patch
http://article.gmane.org/gmane.comp.emulators.qemu/403467
virtio: convert to use DMA api

Tested with patchset
http://article.gmane.org/gmane.linux.kernel.virtualization/27545
virtio-pci: iommu support

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

---
 include/hw/virtio/virtio-access.h              | 3 ++-
 include/hw/virtio/virtio.h                     | 6 +++++-
 include/standard-headers/linux/virtio_config.h | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 967cc75..bb6f34e 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -23,7 +23,8 @@ static inline AddressSpace *virtio_get_dma_as(VirtIODevice *vdev)
     BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 
-    if (k->get_dma_as) {
+    if ((vdev->host_features & (0x1ULL << VIRTIO_F_IOMMU_PLATFORM)) &&
+        k->get_dma_as) {
         return k->get_dma_as(qbus->parent);
     }
     return &address_space_memory;
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b12faa9..34d3041 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -228,7 +228,11 @@ typedef struct VirtIORNGConf VirtIORNGConf;
     DEFINE_PROP_BIT64("notify_on_empty", _state, _field,  \
                       VIRTIO_F_NOTIFY_ON_EMPTY, true), \
     DEFINE_PROP_BIT64("any_layout", _state, _field, \
-                      VIRTIO_F_ANY_LAYOUT, true)
+                      VIRTIO_F_ANY_LAYOUT, true), \
+    DEFINE_PROP_BIT64("iommu_passthrough", _state, _field, \
+                      VIRTIO_F_IOMMU_PASSTHROUGH, false), \
+    DEFINE_PROP_BIT64("iommu_platform", _state, _field, \
+                      VIRTIO_F_IOMMU_PLATFORM, false)
 
 hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n);
diff --git a/include/standard-headers/linux/virtio_config.h b/include/standard-headers/linux/virtio_config.h
index bcc445b..5564dab 100644
--- a/include/standard-headers/linux/virtio_config.h
+++ b/include/standard-headers/linux/virtio_config.h
@@ -61,4 +61,12 @@
 /* v1.0 compliant. */
 #define VIRTIO_F_VERSION_1		32
 
+/* Request IOMMU passthrough (if available)
+ * Without VIRTIO_F_IOMMU_PLATFORM: bypass the IOMMU even if enabled.
+ * With VIRTIO_F_IOMMU_PLATFORM: suggest disabling IOMMU.
+ */
+#define VIRTIO_F_IOMMU_PASSTHROUGH	33
+
+/* Do not bypass the IOMMU (if configured) */
+#define VIRTIO_F_IOMMU_PLATFORM		34
 #endif /* _LINUX_VIRTIO_CONFIG_H */
-- 
MST

^ permalink raw reply related	[flat|nested] 97+ messages in thread
* [PATCH RFC] fixup! virtio: convert to use DMA api
@ 2016-04-18 11:47 Michael S. Tsirkin
  0 siblings, 0 replies; 97+ messages in thread
From: Michael S. Tsirkin @ 2016-04-18 11:47 UTC (permalink / raw)
  To: qemu-devel, linux-kernel
  Cc: Wei Liu, Andy Lutomirski, qemu-block, Christian Borntraeger,
	peterx, virtualization, Amit Shah, Stefan Hajnoczi, kvm,
	pbonzini, David Woodhouse

This adds a flag to enable/disable bypassing the IOMMU by
virtio devices.

This is on top of patch
http://article.gmane.org/gmane.comp.emulators.qemu/403467
virtio: convert to use DMA api

Tested with patchset
http://article.gmane.org/gmane.linux.kernel.virtualization/27545
virtio-pci: iommu support

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

---
 include/hw/virtio/virtio-access.h              | 3 ++-
 include/hw/virtio/virtio.h                     | 6 +++++-
 include/standard-headers/linux/virtio_config.h | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 967cc75..bb6f34e 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -23,7 +23,8 @@ static inline AddressSpace *virtio_get_dma_as(VirtIODevice *vdev)
     BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 
-    if (k->get_dma_as) {
+    if ((vdev->host_features & (0x1ULL << VIRTIO_F_IOMMU_PLATFORM)) &&
+        k->get_dma_as) {
         return k->get_dma_as(qbus->parent);
     }
     return &address_space_memory;
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b12faa9..34d3041 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -228,7 +228,11 @@ typedef struct VirtIORNGConf VirtIORNGConf;
     DEFINE_PROP_BIT64("notify_on_empty", _state, _field,  \
                       VIRTIO_F_NOTIFY_ON_EMPTY, true), \
     DEFINE_PROP_BIT64("any_layout", _state, _field, \
-                      VIRTIO_F_ANY_LAYOUT, true)
+                      VIRTIO_F_ANY_LAYOUT, true), \
+    DEFINE_PROP_BIT64("iommu_passthrough", _state, _field, \
+                      VIRTIO_F_IOMMU_PASSTHROUGH, false), \
+    DEFINE_PROP_BIT64("iommu_platform", _state, _field, \
+                      VIRTIO_F_IOMMU_PLATFORM, false)
 
 hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n);
diff --git a/include/standard-headers/linux/virtio_config.h b/include/standard-headers/linux/virtio_config.h
index bcc445b..5564dab 100644
--- a/include/standard-headers/linux/virtio_config.h
+++ b/include/standard-headers/linux/virtio_config.h
@@ -61,4 +61,12 @@
 /* v1.0 compliant. */
 #define VIRTIO_F_VERSION_1		32
 
+/* Request IOMMU passthrough (if available)
+ * Without VIRTIO_F_IOMMU_PLATFORM: bypass the IOMMU even if enabled.
+ * With VIRTIO_F_IOMMU_PLATFORM: suggest disabling IOMMU.
+ */
+#define VIRTIO_F_IOMMU_PASSTHROUGH	33
+
+/* Do not bypass the IOMMU (if configured) */
+#define VIRTIO_F_IOMMU_PLATFORM		34
 #endif /* _LINUX_VIRTIO_CONFIG_H */
-- 
MST

^ permalink raw reply related	[flat|nested] 97+ messages in thread

end of thread, other threads:[~2016-04-20 15:43 UTC | newest]

Thread overview: 97+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-18 11:47 [PATCH RFC] fixup! virtio: convert to use DMA api Michael S. Tsirkin
2016-04-18 11:47 ` [Qemu-devel] " Michael S. Tsirkin
2016-04-18 11:58 ` David Woodhouse
2016-04-18 11:58   ` [Qemu-devel] " David Woodhouse
2016-04-18 13:12   ` Michael S. Tsirkin
2016-04-18 13:12   ` Michael S. Tsirkin
2016-04-18 13:12     ` [Qemu-devel] " Michael S. Tsirkin
2016-04-18 14:03     ` David Woodhouse
2016-04-18 14:03     ` David Woodhouse
2016-04-18 14:03       ` [Qemu-devel] " David Woodhouse
2016-04-18 14:23       ` Michael S. Tsirkin
2016-04-18 14:23         ` [Qemu-devel] " Michael S. Tsirkin
2016-04-18 14:23         ` Michael S. Tsirkin
2016-04-18 15:22         ` David Woodhouse
2016-04-18 15:22           ` [Qemu-devel] " David Woodhouse
2016-04-18 15:22           ` David Woodhouse
2016-04-18 15:30           ` Michael S. Tsirkin
2016-04-18 15:30             ` [Qemu-devel] " Michael S. Tsirkin
2016-04-18 15:30             ` Michael S. Tsirkin
2016-04-18 15:51             ` David Woodhouse
2016-04-18 15:51               ` [Qemu-devel] " David Woodhouse
2016-04-18 15:51               ` David Woodhouse
2016-04-18 16:27               ` Michael S. Tsirkin
2016-04-18 16:27                 ` [Qemu-devel] " Michael S. Tsirkin
2016-04-18 16:27                 ` Michael S. Tsirkin
2016-04-18 18:29                 ` David Woodhouse
2016-04-18 18:29                   ` [Qemu-devel] " David Woodhouse
2016-04-18 18:29                   ` David Woodhouse
2016-04-18 19:24                   ` Andy Lutomirski
2016-04-18 19:24                     ` [Qemu-devel] " Andy Lutomirski
2016-04-18 19:24                     ` Andy Lutomirski
2016-04-19 10:27                     ` Michael S. Tsirkin
2016-04-19 10:27                       ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 10:27                       ` Michael S. Tsirkin
2016-04-19 16:02                       ` Andy Lutomirski
2016-04-19 16:02                         ` [Qemu-devel] " Andy Lutomirski
2016-04-19 16:02                         ` Andy Lutomirski
2016-04-19 16:09                         ` Michael S. Tsirkin
2016-04-19 16:09                           ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 16:09                           ` Michael S. Tsirkin
2016-04-19 16:12                           ` Andy Lutomirski
2016-04-19 16:12                             ` [Qemu-devel] " Andy Lutomirski
2016-04-19 16:12                             ` Andy Lutomirski
2016-04-19 16:20                             ` Michael S. Tsirkin
2016-04-19 16:20                               ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 16:20                               ` Michael S. Tsirkin
2016-04-19 16:26                               ` David Woodhouse
2016-04-19 16:26                                 ` [Qemu-devel] " David Woodhouse
2016-04-19 16:26                                 ` David Woodhouse
2016-04-19 17:49                                 ` Michael S. Tsirkin
2016-04-19 17:49                                   ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 17:49                                   ` Michael S. Tsirkin
2016-04-19 18:01                                   ` Andy Lutomirski
2016-04-19 18:01                                   ` Andy Lutomirski
2016-04-19 18:01                                     ` [Qemu-devel] " Andy Lutomirski
2016-04-19 18:01                                     ` Andy Lutomirski
2016-04-19 20:16                                     ` Michael S. Tsirkin
2016-04-19 20:16                                       ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 20:16                                       ` Michael S. Tsirkin
2016-04-19 20:27                                       ` Andy Lutomirski
2016-04-19 20:27                                       ` Andy Lutomirski
2016-04-19 20:27                                         ` [Qemu-devel] " Andy Lutomirski
2016-04-19 20:27                                         ` Andy Lutomirski
2016-04-19 20:54                                         ` Michael S. Tsirkin
2016-04-19 20:54                                           ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 20:54                                           ` Michael S. Tsirkin
2016-04-19 21:07                                           ` Andy Lutomirski
2016-04-19 21:07                                           ` Andy Lutomirski
2016-04-19 21:07                                             ` [Qemu-devel] " Andy Lutomirski
2016-04-19 21:07                                             ` Andy Lutomirski
2016-04-20 13:14                                             ` Michael S. Tsirkin
2016-04-20 13:14                                               ` [Qemu-devel] " Michael S. Tsirkin
2016-04-20 13:14                                               ` Michael S. Tsirkin
2016-04-20 15:43                                               ` Andy Lutomirski
2016-04-20 15:43                                               ` Andy Lutomirski
2016-04-20 15:43                                                 ` [Qemu-devel] " Andy Lutomirski
2016-04-20 15:43                                                 ` Andy Lutomirski
2016-04-19 20:54                                         ` Michael S. Tsirkin
2016-04-19 20:16                                     ` Michael S. Tsirkin
2016-04-19 17:49                                 ` Michael S. Tsirkin
2016-04-19 16:09                         ` Michael S. Tsirkin
2016-04-19 16:02                       ` Andy Lutomirski
2016-04-19  9:13                   ` Michael S. Tsirkin
2016-04-19  9:13                     ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19  9:13                     ` Michael S. Tsirkin
2016-04-19 14:44                     ` Alex Williamson
2016-04-19 14:44                       ` [Qemu-devel] " Alex Williamson
2016-04-19 14:44                       ` Alex Williamson
2016-04-19 16:00                     ` Andy Lutomirski
2016-04-19 16:00                       ` [Qemu-devel] " Andy Lutomirski
2016-04-19 16:00                       ` Andy Lutomirski
2016-04-19 16:04                       ` Michael S. Tsirkin
2016-04-19 16:04                       ` Michael S. Tsirkin
2016-04-19 16:04                         ` [Qemu-devel] " Michael S. Tsirkin
2016-04-19 16:00                     ` Andy Lutomirski
2016-04-18 11:58 ` David Woodhouse
2016-04-18 11:47 Michael S. Tsirkin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.