66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
|
From 4054b1e42fde8f22703d5fc9bc84a9179ee8f9f7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
||
|
|
Date: Wed, 20 Jul 2022 08:59:40 +0200
|
||
|
|
Subject: [PATCH] vdpa: Export vhost_vdpa_dma_map and unmap calls
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Shadow CVQ will copy buffers on qemu VA, so we avoid TOCTOU attacks from
|
||
|
|
the guest that could set a different state in qemu device model and vdpa
|
||
|
|
device.
|
||
|
|
|
||
|
|
To do so, it needs to be able to map these new buffers to the device.
|
||
|
|
|
||
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
||
|
|
---
|
||
|
|
hw/virtio/vhost-vdpa.c | 7 +++----
|
||
|
|
include/hw/virtio/vhost-vdpa.h | 4 ++++
|
||
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
||
|
|
index a8d42655f0..8e962f511d 100644
|
||
|
|
--- a/hw/virtio/vhost-vdpa.c
|
||
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
||
|
|
@@ -73,8 +73,8 @@ static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *section,
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
|
||
|
|
- void *vaddr, bool readonly)
|
||
|
|
+int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
|
||
|
|
+ void *vaddr, bool readonly)
|
||
|
|
{
|
||
|
|
struct vhost_msg_v2 msg = {};
|
||
|
|
int fd = v->device_fd;
|
||
|
|
@@ -99,8 +99,7 @@ static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova,
|
||
|
|
- hwaddr size)
|
||
|
|
+int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size)
|
||
|
|
{
|
||
|
|
struct vhost_msg_v2 msg = {};
|
||
|
|
int fd = v->device_fd;
|
||
|
|
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
|
||
|
|
index a29dbb3f53..7214eb47dc 100644
|
||
|
|
--- a/include/hw/virtio/vhost-vdpa.h
|
||
|
|
+++ b/include/hw/virtio/vhost-vdpa.h
|
||
|
|
@@ -39,4 +39,8 @@ typedef struct vhost_vdpa {
|
||
|
|
VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX];
|
||
|
|
} VhostVDPA;
|
||
|
|
|
||
|
|
+int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
|
||
|
|
+ void *vaddr, bool readonly);
|
||
|
|
+int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova, hwaddr size);
|
||
|
|
+
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|