This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit bc392f1562bac460f80a7f40ade1218c02bdac61 Author: Yongrong Wang <[email protected]> AuthorDate: Mon Apr 28 16:52:44 2025 +0800 drivers/virtio: add virtio_get_buffers() A driver whose device returns one request as a chain of descriptors (e.g. a vsock packet: header plus payload) needs all buffers of the chain from one used ring entry. virtqueue_get_buffer() only returns the first. Add virtio_get_buffers(), which returns the head buffer and then walks the chain with virtio_get_next_buffer(), a wrapper around virtqueue_get_next_avail_buffer() that also accepts a NULL next_idx. net/vsock/vsock_virtio.c already calls virtio_get_buffers(). Signed-off-by: Yongrong Wang <[email protected]> Signed-off-by: Bowen Wang <[email protected]> --- drivers/virtio/virtio.c | 60 +++++++++++++++++++++++++++++++++++++++++++ include/nuttx/virtio/virtio.h | 6 +++++ 2 files changed, 66 insertions(+) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index d64a52757d7..cfaef5d09f7 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -200,6 +200,66 @@ static int virtio_dev_ioctl(FAR struct file *filep, int cmd, * Public Functions ****************************************************************************/ +/**************************************************************************** + * Name: virtio_get_next_buffer + ****************************************************************************/ + +FAR void *virtio_get_next_buffer(FAR struct virtqueue *vq, uint16_t idx, + FAR uint16_t *next_idx, + FAR uint32_t *next_len) +{ + uint16_t next; + + return virtqueue_get_next_avail_buffer(vq, idx, + next_idx ? next_idx : &next, + next_len); +} + +/**************************************************************************** + * Name: virtio_get_buffers + ****************************************************************************/ + +ssize_t virtio_get_buffers(FAR struct virtqueue *vq, + FAR struct virtqueue_buf *vb, size_t vbcnt) +{ + FAR void *buf; + uint16_t head; + uint16_t idx; + uint32_t len; + size_t i; + + DEBUGASSERT(vb != NULL && vbcnt >= 1); + + buf = virtqueue_get_buffer(vq, &len, &idx); + if (buf == NULL) + { + return -ENOMEM; + } + + vb[0].buf = buf; + vb[0].len = len; + + head = vq->vq_ring.used->ring[idx].id; + for (i = 1, idx = head; ; i++) + { + buf = virtio_get_next_buffer(vq, idx, &idx, &len); + if (buf == NULL) + { + break; + } + else if (i >= vbcnt) + { + vrterr("vbcnt %zu is not enough\n", vbcnt); + return -EINVAL; + } + + vb[i].buf = buf; + vb[i].len = len; + } + + return i; +} + /**************************************************************************** * Name: virtio_register_drivers ****************************************************************************/ diff --git a/include/nuttx/virtio/virtio.h b/include/nuttx/virtio/virtio.h index a6be3d5bd2a..0649e64d8d0 100644 --- a/include/nuttx/virtio/virtio.h +++ b/include/nuttx/virtio/virtio.h @@ -248,6 +248,12 @@ void virtio_addrenv_unmap(FAR struct virtio_device *vdev, FAR void *buf, FAR void *mapped); #endif +FAR void *virtio_get_next_buffer(FAR struct virtqueue *vq, uint16_t idx, + FAR uint16_t *next_idx, + FAR uint32_t *next_len); +ssize_t virtio_get_buffers(FAR struct virtqueue *vq, + FAR struct virtqueue_buf *vb, size_t vbcnt); + #ifdef __cplusplus } #endif
