[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v5 16/23] vdpa: Add map/unmap operation callback to SVQ
From: |
Eugenio Pérez |
Subject: |
[RFC PATCH v5 16/23] vdpa: Add map/unmap operation callback to SVQ |
Date: |
Fri, 8 Apr 2022 15:34:08 +0200 |
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 21 +++++++++++++++++++--
hw/virtio/vhost-shadow-virtqueue.c | 8 +++++++-
hw/virtio/vhost-vdpa.c | 20 +++++++++++++++++++-
3 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index 4ff6a0cda0..6e61d9bfef 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -26,6 +26,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;
+
/* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue {
/* Shadow vring */
@@ -67,6 +76,12 @@ typedef 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;
@@ -96,8 +111,10 @@ void vhost_svq_start(VhostShadowVirtqueue *svq,
VirtIODevice *vdev,
VirtQueue *vq);
void vhost_svq_stop(VhostShadowVirtqueue *svq);
-VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree *iova_tree,
- const VhostShadowVirtqueueOps *ops);
+VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree *iova_map,
+ const VhostShadowVirtqueueOps *ops,
+ const VhostShadowVirtqueueMapOps *map_ops,
+ void *map_ops_opaque);
void vhost_svq_free(gpointer vq);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(VhostShadowVirtqueue, vhost_svq_free);
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index 208832a698..15e6cbc5cb 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -610,13 +610,17 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
*
* @iova_tree: Tree to perform descriptors translations
* @ops: SVQ operations hooks
+ * @map_ops: SVQ mapping operation hooks
+ * @map_ops_opaque: Opaque data to pass to mapping operations
*
* Returns the new virtqueue or NULL.
*
* In case of error, reason is reported through error_report.
*/
VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree *iova_tree,
- const VhostShadowVirtqueueOps *ops)
+ const VhostShadowVirtqueueOps *ops,
+ const VhostShadowVirtqueueMapOps *map_ops,
+ void *map_ops_opaque)
{
g_autofree VhostShadowVirtqueue *svq = g_new0(VhostShadowVirtqueue, 1);
int r;
@@ -639,6 +643,8 @@ VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree
*iova_tree,
event_notifier_set_handler(&svq->hdev_call, vhost_svq_handle_call);
svq->iova_tree = iova_tree;
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 421eddf8ca..d09e06d212 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -385,6 +385,22 @@ static int vhost_vdpa_get_dev_features(struct vhost_dev
*dev,
return ret;
}
+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)
{
@@ -412,7 +428,9 @@ static int vhost_vdpa_init_svq(struct vhost_dev *hdev,
struct vhost_vdpa *v,
shadow_vqs = g_ptr_array_new_full(hdev->nvqs, vhost_svq_free);
for (unsigned n = 0; n < hdev->nvqs; ++n) {
g_autoptr(VhostShadowVirtqueue) svq = vhost_svq_new(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);
--
2.27.0
- Re: [RFC PATCH v5 06/23] vdpa: Add x-svq to NetdevVhostVDPAOptions, (continued)
- [RFC PATCH v5 07/23] vhost: move descriptor translation to vhost_svq_vring_write_descs, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 08/23] vdpa: Fix index calculus at vhost_vdpa_svqs_start, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 09/23] virtio-net: Expose ctrl virtqueue logic, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 10/23] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 11/23] virtio: Make virtqueue_alloc_element non-static, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 12/23] vhost: Add SVQElement, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 13/23] vhost: Add custom used buffer callback, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 15/23] vhost: Add vhost_iova_tree_find, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 14/23] vdpa: control virtqueue support on shadow virtqueue, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 16/23] vdpa: Add map/unmap operation callback to SVQ,
Eugenio Pérez <=
- [RFC PATCH v5 17/23] vhost: Add vhost_svq_inject, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 18/23] vdpa: add NetClientState->start() callback, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 21/23] vhost: Make possible to check for device exclusive vq group, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 19/23] vdpa: Add vhost_vdpa_start_control_svq, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 20/23] vhost: Update kernel headers, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 22/23] vdpa: Add asid attribute to vdpa device, Eugenio Pérez, 2022/04/08
- [RFC PATCH v5 23/23] vdpa: Add x-cvq-svq, Eugenio Pérez, 2022/04/08