Signed-off-by: Eugenio Pérez <epere...@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 13 ++++++++++++-
hw/virtio/vhost-shadow-virtqueue.c | 12 +++++++++++-
hw/virtio/vhost-vdpa.c | 20 +++++++++++++++++++-
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index f23fb93c20..bf3b658889 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -23,6 +23,15 @@ typedef struct VhostShadowVirtqueueOps {
VirtQueueElementCallback used_elem_handler;
} VhostShadowVirtqueueOps;
+typedef int (*vhost_svq_map_op)(hwaddr iova, hwaddr size, void *vaddr,
+ bool readonly, void *opaque);
+typedef int (*vhost_svq_unmap_op)(hwaddr iova, hwaddr size, void *opaque);
+
+typedef struct VhostShadowVirtqueueMapOps {
+ vhost_svq_map_op map;
+ vhost_svq_unmap_op unmap;
+} VhostShadowVirtqueueMapOps;
+
bool vhost_svq_valid_device_features(uint64_t *features);
bool vhost_svq_valid_guest_features(uint64_t *features);
bool vhost_svq_ack_guest_features(uint64_t dev_features,
@@ -47,7 +56,9 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice
*vdev,
void vhost_svq_stop(VhostShadowVirtqueue *svq);
VhostShadowVirtqueue *vhost_svq_new(uint16_t qsize, VhostIOVATree *iova_map,
- const VhostShadowVirtqueueOps *ops);
+ const VhostShadowVirtqueueOps *ops,
+ const VhostShadowVirtqueueMapOps *map_ops,
+ void *map_ops_opaque);
void vhost_svq_free(VhostShadowVirtqueue *vq);
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index 5665947d1a..2ba3c2966a 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -62,6 +62,12 @@ struct VhostShadowVirtqueue {
/* Optional callbacks */
const VhostShadowVirtqueueOps *ops;
+ /* Device memory mapping callbacks */
+ const VhostShadowVirtqueueMapOps *map_ops;
+
+ /* Device memory mapping callbacks opaque */
+ void *map_ops_opaque;
+
/* Optional custom used virtqueue element handler */
VirtQueueElementCallback used_elem_cb;
@@ -724,7 +730,9 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
* In case of error, reason is reported through error_report.
*/
VhostShadowVirtqueue *vhost_svq_new(uint16_t qsize, VhostIOVATree *iova_tree,
- const VhostShadowVirtqueueOps *ops)
+ const VhostShadowVirtqueueOps *ops,
+ const VhostShadowVirtqueueMapOps *map_ops,
+ void *map_ops_opaque)
{
size_t desc_size = sizeof(vring_desc_t) * qsize;
size_t device_size, driver_size;
@@ -760,6 +768,8 @@ VhostShadowVirtqueue *vhost_svq_new(uint16_t qsize,
VhostIOVATree *iova_tree,
svq->ring_id_maps = g_new0(SVQElement *, qsize);
event_notifier_set_handler(&svq->hdev_call, vhost_svq_handle_call);
svq->ops = ops;
+ svq->map_ops = map_ops;
+ svq->map_ops_opaque = map_ops_opaque;
return g_steal_pointer(&svq);
err_init_hdev_call:
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 5707b1952d..4142a1ce5d 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1178,6 +1178,22 @@ static int vhost_vdpa_get_max_queue_size(struct
vhost_dev *dev,
return vhost_vdpa_call(dev, VHOST_VDPA_GET_VRING_NUM, qsize);
}
+static int vhost_vdpa_svq_map(hwaddr iova, hwaddr size, void *vaddr,
+ bool readonly, void *opaque)
+{
+ return vhost_vdpa_dma_map(opaque, iova, size, vaddr, readonly);
+}
+
+static int vhost_vdpa_svq_unmap(hwaddr iova, hwaddr size, void *opaque)
+{
+ return vhost_vdpa_dma_unmap(opaque, iova, size);
+}
+
+static const VhostShadowVirtqueueMapOps vhost_vdpa_svq_map_ops = {
+ .map = vhost_vdpa_svq_map,
+ .unmap = vhost_vdpa_svq_unmap,
+};
+
static int vhost_vdpa_init_svq(struct vhost_dev *hdev, struct vhost_vdpa *v,
Error **errp)
{
@@ -1219,7 +1235,9 @@ static int vhost_vdpa_init_svq(struct vhost_dev *hdev,
struct vhost_vdpa *v,
DMAMap device_region, driver_region;
struct vhost_vring_addr addr;
VhostShadowVirtqueue *svq = vhost_svq_new(qsize, v->iova_tree,
- v->shadow_vq_ops);
+ v->shadow_vq_ops,
+ &vhost_vdpa_svq_map_ops,
+ v);
if (unlikely(!svq)) {
error_setg(errp, "Cannot create svq %u", n);
return -1;
--
2.27.0
