[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 09/21] vhost: Add SVQDescState
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 09/21] vhost: Add SVQDescState |
Date: |
Wed, 20 Jul 2022 08:59:34 +0200 |
This will allow SVQ to add context to the different queue elements.
This patch only store the actual element, no functional change intended.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 8 ++++++--
hw/virtio/vhost-shadow-virtqueue.c | 16 ++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index c132c994e9..d646c35054 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -15,6 +15,10 @@
#include "standard-headers/linux/vhost_types.h"
#include "hw/virtio/vhost-iova-tree.h"
+typedef struct SVQDescState {
+ VirtQueueElement *elem;
+} SVQDescState;
+
/* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue {
/* Shadow vring */
@@ -47,8 +51,8 @@ typedef struct VhostShadowVirtqueue {
/* IOVA mapping */
VhostIOVATree *iova_tree;
- /* Map for use the guest's descriptors */
- VirtQueueElement **ring_id_maps;
+ /* SVQ vring descriptors state */
+ SVQDescState *desc_state;
/* Next VirtQueue element that guest made available */
VirtQueueElement *next_guest_avail_elem;
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index e3afa2ba44..e4c09e2d88 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -256,7 +256,7 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, const
struct iovec *out_sg,
return -EINVAL;
}
- svq->ring_id_maps[qemu_head] = elem;
+ svq->desc_state[qemu_head].elem = elem;
vhost_svq_kick(svq);
return 0;
}
@@ -411,21 +411,21 @@ static VirtQueueElement
*vhost_svq_get_buf(VhostShadowVirtqueue *svq,
return NULL;
}
- if (unlikely(!svq->ring_id_maps[used_elem.id])) {
+ if (unlikely(!svq->desc_state[used_elem.id].elem)) {
qemu_log_mask(LOG_GUEST_ERROR,
"Device %s says index %u is used, but it was not available",
svq->vdev->name, used_elem.id);
return NULL;
}
- num = svq->ring_id_maps[used_elem.id]->in_num +
- svq->ring_id_maps[used_elem.id]->out_num;
+ num = svq->desc_state[used_elem.id].elem->in_num +
+ svq->desc_state[used_elem.id].elem->out_num;
last_used_chain = vhost_svq_last_desc_of_chain(svq, num, used_elem.id);
svq->desc_next[last_used_chain] = svq->free_head;
svq->free_head = used_elem.id;
*len = used_elem.len;
- return g_steal_pointer(&svq->ring_id_maps[used_elem.id]);
+ return g_steal_pointer(&svq->desc_state[used_elem.id].elem);
}
static void vhost_svq_flush(VhostShadowVirtqueue *svq,
@@ -595,7 +595,7 @@ void vhost_svq_start(VhostShadowVirtqueue *svq,
VirtIODevice *vdev,
memset(svq->vring.desc, 0, driver_size);
svq->vring.used = qemu_memalign(qemu_real_host_page_size(), device_size);
memset(svq->vring.used, 0, device_size);
- svq->ring_id_maps = g_new0(VirtQueueElement *, svq->vring.num);
+ svq->desc_state = g_new0(SVQDescState, svq->vring.num);
svq->desc_next = g_new0(uint16_t, svq->vring.num);
for (unsigned i = 0; i < svq->vring.num - 1; i++) {
svq->desc_next[i] = cpu_to_le16(i + 1);
@@ -620,7 +620,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
for (unsigned i = 0; i < svq->vring.num; ++i) {
g_autofree VirtQueueElement *elem = NULL;
- elem = g_steal_pointer(&svq->ring_id_maps[i]);
+ elem = g_steal_pointer(&svq->desc_state[i].elem);
if (elem) {
virtqueue_detach_element(svq->vq, elem, 0);
}
@@ -632,7 +632,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
}
svq->vq = NULL;
g_free(svq->desc_next);
- g_free(svq->ring_id_maps);
+ g_free(svq->desc_state);
qemu_vfree(svq->vring.desc);
qemu_vfree(svq->vring.used);
}
--
2.31.1
- [PATCH v6 00/21] vdpa net devices Rx filter change notification with Shadow VQ, Eugenio Pérez, 2022/07/20
- [PATCH v6 02/21] virtio-net: Expose MAC_TABLE_ENTRIES, Eugenio Pérez, 2022/07/20
- [PATCH v6 07/21] vhost: Check for queue full at vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 04/21] vdpa: Avoid compiler to squash reads to used idx, Eugenio Pérez, 2022/07/20
- [PATCH v6 01/21] vhost: move descriptor translation to vhost_svq_vring_write_descs, Eugenio Pérez, 2022/07/20
- [PATCH v6 05/21] vhost: Reorder vhost_svq_kick, Eugenio Pérez, 2022/07/20
- [PATCH v6 06/21] vhost: Move vhost_svq_kick call to vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 08/21] vhost: Decouple vhost_svq_add from VirtQueueElement, Eugenio Pérez, 2022/07/20
- [PATCH v6 03/21] virtio-net: Expose ctrl virtqueue logic, Eugenio Pérez, 2022/07/20
- [PATCH v6 09/21] vhost: Add SVQDescState,
Eugenio Pérez <=
- [PATCH v6 10/21] vhost: Track number of descs in SVQDescState, Eugenio Pérez, 2022/07/20
- [PATCH v6 12/21] vhost: Expose vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 15/21] vdpa: Export vhost_vdpa_dma_map and unmap calls, Eugenio Pérez, 2022/07/20
- [PATCH v6 13/21] vhost: add vhost_svq_poll, Eugenio Pérez, 2022/07/20
- [PATCH v6 11/21] vhost: add vhost_svq_push_elem, Eugenio Pérez, 2022/07/20
- [PATCH v6 14/21] vhost: Add svq avail_handler callback, Eugenio Pérez, 2022/07/20
- [PATCH v6 16/21] vhost-net-vdpa: add stubs for when no virtio-net device is present, Eugenio Pérez, 2022/07/20
- [PATCH v6 18/21] vdpa: Buffer CVQ support on shadow virtqueue, Eugenio Pérez, 2022/07/20
- [PATCH v6 17/21] vdpa: manual forward CVQ buffers, Eugenio Pérez, 2022/07/20
- [PATCH v6 19/21] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Eugenio Pérez, 2022/07/20