1 files changed, 31 insertions, 37 deletions

diff --git a/vu_common.c b/vu_common.c
index 834a54f..b6e1fa9 100644
--- a/vu_common.c
+++ b/vu_common.c
@@ -52,27 +52,14 @@ int vu_packet_check_range(struct vdev_memory *memory,
 }
 
 /**
- * vu_init_elem() - initialize an array of virtqueue elements with 1 iov in each
- * @elem:	Array of virtqueue elements to initialize
- * @iov:	Array of iovec to assign to virtqueue element
- * @elem_cnt:	Number of virtqueue element
- */
-void vu_init_elem(struct vu_virtq_element *elem, struct iovec *iov, int elem_cnt)
-{
-	int i;
-
-	for (i = 0; i < elem_cnt; i++)
-		vu_set_element(&elem[i], NULL, &iov[i]);
-}
-
-/**
  * vu_collect() - collect virtio buffers from a given virtqueue
  * @vdev:		vhost-user device
  * @vq:			virtqueue to collect from
- * @elem:		Array of virtqueue element
- * 			each element must be initialized with one iovec entry
- * 			in the in_sg array.
+ * @elem:		Array of @max_elem virtqueue elements
  * @max_elem:		Number of virtqueue elements in the array
+ * @in_sg:		Incoming iovec array for device-writable descriptors
+ * @max_in_sg:		Maximum number of entries in @in_sg
+ * @in_total:		Number of collected entries from @in_sg (output)
  * @size:		Maximum size of the data in the frame
  * @collected:		Collected buffer length, up to @size, set on return
  *
@@ -80,20 +67,21 @@ void vu_init_elem(struct vu_virtq_element *elem, struct iovec *iov, int elem_cnt
  */
 int vu_collect(const struct vu_dev *vdev, struct vu_virtq *vq,
 	       struct vu_virtq_element *elem, int max_elem,
+	       struct iovec *in_sg, size_t max_in_sg, size_t *in_total,
 	       size_t size, size_t *collected)
 {
 	size_t current_size = 0;
+	size_t current_iov = 0;
 	int elem_cnt = 0;
 
-	while (current_size < size && elem_cnt < max_elem) {
-		struct iovec *iov;
+	while (current_size < size && elem_cnt < max_elem &&
+	       current_iov < max_in_sg) {
 		int ret;
 
 		ret = vu_queue_pop(vdev, vq, &elem[elem_cnt],
-				   elem[elem_cnt].in_sg,
-				   elem[elem_cnt].in_num,
-				   elem[elem_cnt].out_sg,
-				   elem[elem_cnt].out_num);
+				   &in_sg[current_iov],
+				   max_in_sg - current_iov,
+				   NULL, 0);
 		if (ret < 0)
 			break;
 
@@ -103,18 +91,22 @@ int vu_collect(const struct vu_dev *vdev, struct vu_virtq *vq,
 			break;
 		}
 
-		iov = &elem[elem_cnt].in_sg[0];
-
-		if (iov->iov_len > size - current_size)
-			iov->iov_len = size - current_size;
+		elem[elem_cnt].in_num = iov_truncate(elem[elem_cnt].in_sg,
+						     elem[elem_cnt].in_num,
+						     size - current_size);
 
-		current_size += iov->iov_len;
+		current_size += iov_size(elem[elem_cnt].in_sg,
+					 elem[elem_cnt].in_num);
+		current_iov += elem[elem_cnt].in_num;
 		elem_cnt++;
 
 		if (!vu_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
 			break;
 	}
 
+	if (in_total)
+		*in_total = current_iov;
+
 	if (collected)
 		*collected = current_size;
 
@@ -147,8 +139,11 @@ void vu_flush(const struct vu_dev *vdev, struct vu_virtq *vq,
 {
 	int i;
 
-	for (i = 0; i < elem_cnt; i++)
-		vu_queue_fill(vdev, vq, &elem[i], elem[i].in_sg[0].iov_len, i);
+	for (i = 0; i < elem_cnt; i++) {
+		size_t elem_size = iov_size(elem[i].in_sg, elem[i].in_num);
+
+		vu_queue_fill(vdev, vq, &elem[i], elem_size, i);
+	}
 
 	vu_queue_flush(vdev, vq, elem_cnt);
 	vu_queue_notify(vdev, vq);
@@ -245,7 +240,7 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size)
 	struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE];
 	struct vu_virtq_element elem[VIRTQUEUE_MAX_SIZE];
 	struct iovec in_sg[VIRTQUEUE_MAX_SIZE];
-	size_t total;
+	size_t total, in_total;
 	int elem_cnt;
 	int i;
 
@@ -256,11 +251,10 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size)
 		return -1;
 	}
 
-	vu_init_elem(elem, in_sg, VIRTQUEUE_MAX_SIZE);
-
 	size += VNET_HLEN;
-	elem_cnt = vu_collect(vdev, vq, elem, VIRTQUEUE_MAX_SIZE, size, &total);
-	if (total < size) {
+	elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), in_sg,
+			      ARRAY_SIZE(in_sg), &in_total, size, &total);
+	if (elem_cnt == 0 || total < size) {
 		debug("vu_send_single: no space to send the data "
 		      "elem_cnt %d size %zd", elem_cnt, total);
 		goto err;
@@ -271,10 +265,10 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size)
 	total -= VNET_HLEN;
 
 	/* copy data from the buffer to the iovec */
-	iov_from_buf(in_sg, elem_cnt, VNET_HLEN, buf, total);
+	iov_from_buf(in_sg, in_total, VNET_HLEN, buf, total);
 
 	if (*c->pcap)
-		pcap_iov(in_sg, elem_cnt, VNET_HLEN);
+		pcap_iov(in_sg, in_total, VNET_HLEN);
 
 	vu_flush(vdev, vq, elem, elem_cnt);