On Fri, Feb 27, 2026 at 03:03:20PM +0100, Laurent Vivier wrote:
> When passing the element count to vu_init_elem(), vu_collect(), or using
> it as a loop bound, use ARRAY_SIZE(elem) instead of the VIRTQUEUE_MAX_SIZE.
> 
> No functional change.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  tcp_vu.c    | 6 +++---
>  udp_vu.c    | 4 ++--
>  vu_common.c | 6 +++---
>  3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tcp_vu.c b/tcp_vu.c
> index bb05fbf45826..98e5974fee0e 100644
> --- a/tcp_vu.c
> +++ b/tcp_vu.c
> @@ -201,17 +201,17 @@ static ssize_t tcp_vu_sock_recv(const struct ctx *c, struct vu_virtq *vq,
>  
>  	hdrlen = tcp_vu_hdrlen(v6);
>  
> -	vu_init_elem(elem, &iov_vu[DISCARD_IOV_NUM], VIRTQUEUE_MAX_SIZE);
> +	vu_init_elem(elem, &iov_vu[DISCARD_IOV_NUM], ARRAY_SIZE(elem));
>  
>  	elem_cnt = 0;
>  	*head_cnt = 0;
> -	while (fillsize > 0 && elem_cnt < VIRTQUEUE_MAX_SIZE) {
> +	while (fillsize > 0 && elem_cnt < ARRAY_SIZE(elem)) {
>  		struct iovec *iov;
>  		size_t frame_size, dlen;
>  		int cnt;
>  
>  		cnt = vu_collect(vdev, vq, &elem[elem_cnt],
> -				 VIRTQUEUE_MAX_SIZE - elem_cnt,
> +				 ARRAY_SIZE(elem) - elem_cnt,
>  				 MAX(MIN(mss, fillsize) + hdrlen, ETH_ZLEN + VNET_HLEN),
>  				 &frame_size);
>  		if (cnt == 0)
> diff --git a/udp_vu.c b/udp_vu.c
> index 51f3718f5925..6f6477f7d046 100644
> --- a/udp_vu.c
> +++ b/udp_vu.c
> @@ -89,9 +89,9 @@ static int udp_vu_sock_recv(const struct ctx *c, struct vu_virtq *vq, int s,
>  	/* compute L2 header length */
>  	hdrlen = udp_vu_hdrlen(v6);
>  
> -	vu_init_elem(elem, iov_vu, VIRTQUEUE_MAX_SIZE);
> +	vu_init_elem(elem, iov_vu, ARRAY_SIZE(elem));
>  
> -	iov_cnt = vu_collect(vdev, vq, elem, VIRTQUEUE_MAX_SIZE,
> +	iov_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem),
>  			     IP_MAX_MTU + ETH_HLEN + VNET_HLEN, NULL);
>  	if (iov_cnt == 0)
>  		return -1;
> diff --git a/vu_common.c b/vu_common.c
> index aa14598ea028..7a8cd18f4e81 100644
> --- a/vu_common.c
> +++ b/vu_common.c
> @@ -174,7 +174,7 @@ static void vu_handle_tx(struct vu_dev *vdev, int index,
>  
>  	count = 0;
>  	out_sg_count = 0;
> -	while (count < VIRTQUEUE_MAX_SIZE &&
> +	while (count < ARRAY_SIZE(elem) &&
>  	       out_sg_count + VU_MAX_TX_BUFFER_NB <= VIRTQUEUE_MAX_SIZE) {
>  		int ret;
>  		struct iov_tail data;
> @@ -259,10 +259,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);
> +	vu_init_elem(elem, in_sg, ARRAY_SIZE(elem));
>  
>  	size += VNET_HLEN;
> -	elem_cnt = vu_collect(vdev, vq, elem, VIRTQUEUE_MAX_SIZE, size, &total);
> +	elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), size, &total);
>  	if (total < size) {
>  		debug("vu_send_single: no space to send the data "
>  		      "elem_cnt %d size %zd", elem_cnt, total);
> -- 
> 2.53.0
> 

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson