[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/19] vhost: Track number of descs in SVQDescState
From: |
Eugenio Pérez |
Subject: |
[PATCH v4 09/19] vhost: Track number of descs in SVQDescState |
Date: |
Mon, 18 Jul 2022 12:29:39 +0200 |
A guest's buffer continuos on GPA may need multiple descriptors on
qemu's VA, so SVQ should track its length sepparatedly.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 6 ++++++
hw/virtio/vhost-shadow-virtqueue.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index d646c35054..5c7e7cbab6 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -17,6 +17,12 @@
typedef struct SVQDescState {
VirtQueueElement *elem;
+
+ /*
+ * Number of descriptors exposed to the device. May or may not match
+ * guest's
+ */
+ unsigned int ndescs;
} SVQDescState;
/* Shadow virtqueue to relay notifications */
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index d12f5afffb..ae5bd6efa8 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -257,6 +257,7 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, const
struct iovec *out_sg,
}
svq->desc_state[qemu_head].elem = elem;
+ svq->desc_state[qemu_head].ndescs = ndescs;
vhost_svq_kick(svq);
return 0;
}
@@ -417,8 +418,7 @@ static VirtQueueElement
*vhost_svq_get_buf(VhostShadowVirtqueue *svq,
return NULL;
}
- num = svq->desc_state[used_elem.id].elem->in_num +
- svq->desc_state[used_elem.id].elem->out_num;
+ num = svq->desc_state[used_elem.id].ndescs;
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;
--
2.31.1
- [PATCH v4 02/19] virtio-net: Expose MAC_TABLE_ENTRIES, (continued)
- [PATCH v4 02/19] virtio-net: Expose MAC_TABLE_ENTRIES, Eugenio Pérez, 2022/07/18
- [PATCH v4 04/19] vhost: Reorder vhost_svq_kick, Eugenio Pérez, 2022/07/18
- [PATCH v4 05/19] vhost: Move vhost_svq_kick call to vhost_svq_add, Eugenio Pérez, 2022/07/18
- [PATCH v4 08/19] vhost: Add SVQDescState, Eugenio Pérez, 2022/07/18
- [PATCH v4 11/19] vhost: Expose vhost_svq_add, Eugenio Pérez, 2022/07/18
- [PATCH v4 10/19] vhost: add vhost_svq_push_elem, Eugenio Pérez, 2022/07/18
- [PATCH v4 07/19] vhost: Decouple vhost_svq_add from VirtQueueElement, Eugenio Pérez, 2022/07/18
- [PATCH v4 14/19] vdpa: Export vhost_vdpa_dma_map and unmap calls, Eugenio Pérez, 2022/07/18
- [PATCH v4 12/19] vhost: add vhost_svq_poll, Eugenio Pérez, 2022/07/18
- [PATCH v4 13/19] vhost: Add svq avail_handler callback, Eugenio Pérez, 2022/07/18
- [PATCH v4 09/19] vhost: Track number of descs in SVQDescState,
Eugenio Pérez <=
- [PATCH v4 15/19] vdpa: manual forward CVQ buffers, Eugenio Pérez, 2022/07/18
- [PATCH v4 16/19] vdpa: Buffer CVQ support on shadow virtqueue, Eugenio Pérez, 2022/07/18
- [PATCH v4 17/19] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Eugenio Pérez, 2022/07/18
- [PATCH v4 18/19] vdpa: Add device migration blocker, Eugenio Pérez, 2022/07/18
- [PATCH v4 19/19] vdpa: Add x-svq to NetdevVhostVDPAOptions, Eugenio Pérez, 2022/07/18