From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JQPloWHS; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id 1EC325A0274 for ; Fri, 27 Feb 2026 15:03:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772201031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lOeIXpHdmi8U4gkcAryLEDRL/1QuNQ2tm4iXiN0XvGc=; b=JQPloWHS+Qh0nZBQ4jTHQpEr3iUvtBOVb7a6/2GY/EtKEqQPd3+d2qZjIi38uDkRFbiDJ9 s/Bg2F+FhGPH9wGnQZqykfjOvXe6MYO+nPdzyqzVXHjdjHehIXROr2Saiq6XUdexcfblv8 /4fwDuT3dMctkDrMeUtfBxgljBptdXc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-510-lzDCoJBPMWSTJif4k0c_5g-1; Fri, 27 Feb 2026 09:03:49 -0500 X-MC-Unique: lzDCoJBPMWSTJif4k0c_5g-1 X-Mimecast-MFC-AGG-ID: lzDCoJBPMWSTJif4k0c_5g_1772201029 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B9DB1956046 for ; Fri, 27 Feb 2026 14:03:49 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.225.86]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 181FC19560B5; Fri, 27 Feb 2026 14:03:47 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 10/12] vu_common: Accept explicit iovec count per element in vu_init_elem() Date: Fri, 27 Feb 2026 15:03:28 +0100 Message-ID: <20260227140330.2216753-11-lvivier@redhat.com> In-Reply-To: <20260227140330.2216753-1-lvivier@redhat.com> References: <20260227140330.2216753-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: h5XYpZt5bpstO0oqBnyGFUvfOqe7nsCO9MYBNEUL_1Y_1772201029 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: YO7SNNNUJ7YNNU242N35H6XJBUJWQCP7 X-Message-ID-Hash: YO7SNNNUJ7YNNU242N35H6XJBUJWQCP7 X-MailFrom: lvivier@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Laurent Vivier X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Extend vu_init_elem() to accept an iov_per_elem parameter specifying how many iovec entries to assign to each virtqueue element. The iov array is now strided by iov_per_elem rather than 1. Update all callers to pass 1, preserving existing behavior. No functional change. Signed-off-by: Laurent Vivier --- tcp_vu.c | 2 +- udp_vu.c | 2 +- vu_common.c | 19 ++++++++++--------- vu_common.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tcp_vu.c b/tcp_vu.c index 77d6e75496a0..51f7834f0307 100644 --- a/tcp_vu.c +++ b/tcp_vu.c @@ -202,7 +202,7 @@ 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], ARRAY_SIZE(elem)); + vu_init_elem(elem, &iov_vu[DISCARD_IOV_NUM], ARRAY_SIZE(elem), 1); elem_cnt = 0; *head_cnt = 0; diff --git a/udp_vu.c b/udp_vu.c index 5ae79b9bb0c5..7e486b74883e 100644 --- a/udp_vu.c +++ b/udp_vu.c @@ -214,7 +214,7 @@ void udp_vu_sock_to_tap(const struct ctx *c, int s, int n, flow_sidx_t tosidx) int elem_cnt, elem_used; ssize_t dlen; - vu_init_elem(elem, iov_vu, ARRAY_SIZE(elem)); + vu_init_elem(elem, iov_vu, ARRAY_SIZE(elem), 1); elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), IP_MAX_MTU + ETH_HLEN + VNET_HLEN, NULL); diff --git a/vu_common.c b/vu_common.c index b6753a556049..e32a56d881a3 100644 --- a/vu_common.c +++ b/vu_common.c @@ -54,18 +54,19 @@ 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 + * vu_init_elem() - Initialize an array of virtqueue elements + * @elem: Array of virtqueue elements to initialize + * @iov: Array of iovecs to assign to virtqueue elements + * @elem_cnt: Number of virtqueue elements + * @iov_per_elem: Number of iovecs per element */ void vu_init_elem(struct vu_virtq_element *elem, struct iovec *iov, - int elem_cnt) + int elem_cnt, int iov_per_elem) { - int i; + int i, j; - for (i = 0; i < elem_cnt; i++) - vu_set_element(&elem[i], 0, NULL, 1, &iov[i]); + for (i = 0, j = 0; i < elem_cnt; i++, j += iov_per_elem) + vu_set_element(&elem[i], 0, NULL, iov_per_elem, &iov[j]); } /** @@ -268,7 +269,7 @@ int vu_send_single(const struct ctx *c, const void *buf, size_t size) return -1; } - vu_init_elem(elem, in_sg, ARRAY_SIZE(elem)); + vu_init_elem(elem, in_sg, ARRAY_SIZE(elem), 1); size += VNET_HLEN; elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), size, &total); diff --git a/vu_common.h b/vu_common.h index c1d2ce888f12..51639c04df14 100644 --- a/vu_common.h +++ b/vu_common.h @@ -48,7 +48,7 @@ static inline void vu_set_element(struct vu_virtq_element *elem, } void vu_init_elem(struct vu_virtq_element *elem, struct iovec *iov, - int elem_cnt); + int elem_cnt, int iov_per_elem); int vu_collect(const struct vu_dev *vdev, struct vu_virtq *vq, struct vu_virtq_element *elem, int max_elem, size_t size, size_t *collected); -- 2.53.0