[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/22] vhost: Move last chain id to SVQ element
From: |
Eugenio Pérez |
Subject: |
[PATCH 08/22] vhost: Move last chain id to SVQ element |
Date: |
Fri, 8 Jul 2022 12:49:59 +0200 |
We will allow SVQ user to store opaque data for each element, so its
easier if we store this kind of information just at avail.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 3 +++
hw/virtio/vhost-shadow-virtqueue.c | 14 ++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index 0b34f48037..5646d875cb 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -17,6 +17,9 @@
typedef struct SVQElement {
VirtQueueElement *elem;
+
+ /* Last descriptor of the chain */
+ uint32_t last_chain_id;
} SVQElement;
/* Shadow virtqueue to relay notifications */
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index d50e1383f5..635b6b359f 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -238,7 +238,9 @@ static bool vhost_svq_add(VhostShadowVirtqueue *svq, const
struct iovec *out_sg,
size_t out_num, const struct iovec *in_sg,
size_t in_num, VirtQueueElement *elem)
{
+ SVQElement *svq_elem;
unsigned qemu_head;
+ size_t n;
bool ok = vhost_svq_add_split(svq, out_sg, out_num, in_sg, in_num,
&qemu_head);
if (unlikely(!ok)) {
@@ -246,7 +248,10 @@ static bool vhost_svq_add(VhostShadowVirtqueue *svq, const
struct iovec *out_sg,
return false;
}
- svq->ring_id_maps[qemu_head].elem = elem;
+ n = out_num + in_num;
+ svq_elem = &svq->ring_id_maps[qemu_head];
+ svq_elem->elem = elem;
+ svq_elem->last_chain_id = vhost_svq_last_desc_of_chain(svq, n, qemu_head);
return true;
}
@@ -399,7 +404,7 @@ static SVQElement vhost_svq_get_buf(VhostShadowVirtqueue
*svq, uint32_t *len)
const vring_used_t *used = svq->vring.used;
vring_used_elem_t used_elem;
SVQElement svq_elem = vhost_svq_empty_elem();
- uint16_t last_used, last_used_chain, num;
+ uint16_t last_used;
if (!vhost_svq_more_used(svq)) {
return svq_elem;
@@ -427,11 +432,8 @@ static SVQElement vhost_svq_get_buf(VhostShadowVirtqueue
*svq, uint32_t *len)
return svq_elem;
}
- num = svq_elem.elem->in_num + svq_elem.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->desc_next[svq_elem.last_chain_id] = svq->free_head;
svq->free_head = used_elem.id;
-
*len = used_elem.len;
return svq_elem;
}
--
2.31.1
- [PATCH 00/22] vdpa net devices Rx filter change notification with Shadow VQ, Eugenio Pérez, 2022/07/08
- [PATCH 01/22] vhost: Return earlier if used buffers overrun, Eugenio Pérez, 2022/07/08
- [PATCH 02/22] vhost: move descriptor translation to vhost_svq_vring_write_descs, Eugenio Pérez, 2022/07/08
- [PATCH 03/22] vdpa: Clean vhost_vdpa_dev_start(dev, false), Eugenio Pérez, 2022/07/08
- [PATCH 04/22] virtio-net: Expose ctrl virtqueue logic, Eugenio Pérez, 2022/07/08
- [PATCH 06/22] vhost: Reorder vhost_svq_last_desc_of_chain, Eugenio Pérez, 2022/07/08
- [PATCH 05/22] vhost: Decouple vhost_svq_add_split from VirtQueueElement, Eugenio Pérez, 2022/07/08
- [PATCH 07/22] vhost: Add SVQElement, Eugenio Pérez, 2022/07/08
- [PATCH 08/22] vhost: Move last chain id to SVQ element,
Eugenio Pérez <=
- [PATCH 11/22] vhost: add vhost_svq_push_elem, Eugenio Pérez, 2022/07/08
- [PATCH 10/22] vdpa: Small rename of error labels, Eugenio Pérez, 2022/07/08
- [PATCH 09/22] vhost: Add opaque member to SVQElement, Eugenio Pérez, 2022/07/08
- [PATCH 12/22] vhost: Add vhost_svq_inject, Eugenio Pérez, 2022/07/08
- [PATCH 13/22] vhost: add vhost_svq_poll, Eugenio Pérez, 2022/07/08
- [PATCH 16/22] vhost: add detach SVQ operation, Eugenio Pérez, 2022/07/08
- [PATCH 18/22] vdpa: manual forward CVQ buffers, Eugenio Pérez, 2022/07/08
- [PATCH 15/22] vhost: Add svq avail_handler callback, Eugenio Pérez, 2022/07/08
- [PATCH 17/22] vdpa: Export vhost_vdpa_dma_map and unmap calls, Eugenio Pérez, 2022/07/08
- [PATCH 19/22] vdpa: Buffer CVQ support on shadow virtqueue, Eugenio Pérez, 2022/07/08