From c6874c974165bd783649ae9e0fb4390881c5e79c Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 4 Jul 2019 10:32:06 +0200

Subject: [PATCH 3/4] virtio-gpu: add iommu support

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Gerd Hoffmann <kraxel@redhat.com>

Message-id: <20190704103207.29158-3-kraxel@redhat.com>

Patchwork-id: 89371

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 2/3] virtio-gpu: add iommu support

Bugzilla: 1531543

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

Switch from cpu_physical_memory_map to dma_memory_map,

so iommu mappings for virtio-gpu objects work properly.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Message-Id: <20180829122101.29852-3-kraxel@redhat.com>

(cherry picked from commit 8da132a56f7ebaabc5b674b5a3a2e6fa8934be45)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/display/virtio-gpu.c | 25 ++++++++++++++-----------

 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c

index cb77ece..327c2be 100644

--- a/hw/display/virtio-gpu.c

+++ b/hw/display/virtio-gpu.c

@@ -16,6 +16,7 @@

 #include "qemu/iov.h"

 #include "ui/console.h"

 #include "trace.h"

+#include "sysemu/dma.h"

 #include "hw/virtio/virtio.h"

 #include "hw/virtio/virtio-gpu.h"

 #include "hw/virtio/virtio-bus.h"

@@ -725,7 +726,8 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g,

         uint32_t l = le32_to_cpu(ents[i].length);

         hwaddr len = l;

         (*iov)[i].iov_len = l;

-        (*iov)[i].iov_base = cpu_physical_memory_map(a, &len, 1);

+        (*iov)[i].iov_base = dma_memory_map(VIRTIO_DEVICE(g)->dma_as,

+                                            a, &len, DMA_DIRECTION_TO_DEVICE);

         if (addr) {

             (*addr)[i] = a;

         }

@@ -753,8 +755,10 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,

     int i;

     for (i = 0; i < count; i++) {

-        cpu_physical_memory_unmap(iov[i].iov_base, iov[i].iov_len, 1,

-                                  iov[i].iov_len);

+        dma_memory_unmap(VIRTIO_DEVICE(g)->dma_as,

+                         iov[i].iov_base, iov[i].iov_len,

+                         DMA_DIRECTION_TO_DEVICE,

+                         iov[i].iov_len);

     }

     g_free(iov);

 }

@@ -1146,13 +1150,17 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,

         for (i = 0; i < res->iov_cnt; i++) {

             hwaddr len = res->iov[i].iov_len;

             res->iov[i].iov_base =

-                cpu_physical_memory_map(res->addrs[i], &len, 1);

+                dma_memory_map(VIRTIO_DEVICE(g)->dma_as,

+                               res->addrs[i], &len, DMA_DIRECTION_TO_DEVICE);

             if (!res->iov[i].iov_base || len != res->iov[i].iov_len) {

                 /* Clean up the half-a-mapping we just created... */

                 if (res->iov[i].iov_base) {

-                    cpu_physical_memory_unmap(res->iov[i].iov_base,

-                                              len, 0, 0);

+                    dma_memory_unmap(VIRTIO_DEVICE(g)->dma_as,

+                                     res->iov[i].iov_base,

+                                     res->iov[i].iov_len,

+                                     DMA_DIRECTION_TO_DEVICE,

+                                     res->iov[i].iov_len);

                 }

                 /* ...and the mappings for previous loop iterations */

                 res->iov_cnt = i;

@@ -1204,11 +1212,6 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)

     Error *local_err = NULL;

     int i;

-    if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {

-        error_setg(errp, "virtio-gpu does not support vIOMMU yet");

-        return;

-    }

-

     if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUTS) {

         error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUTS);

         return;

-- 

1.8.3.1