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=i+uzFmAu; 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 E791F5A026D for ; Fri, 27 Feb 2026 15:03:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772201028; 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=mWfFZsUinoqPLJUVuw2iz3MlKdQZ1BMy3umqjwrSK4w=; b=i+uzFmAuwpSbeLeGaZE4FUlMU7mayV3DxkjDiJbLFS1BU0XZyTNBnG7eBT94sp/SjgYKRZ oeXjvuyBVdCYiHx0sxk/VMtEcISu0sqFbA7GKIWmprKjO/FFtmmpNr3yQe0JREelIGJvH2 EfrtyMJeIqknUF5aE2KTnkVeqG9hmvA= Received: from mx-prod-mc-05.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-474-hqsutkykOTelFTp9fMDN1A-1; Fri, 27 Feb 2026 09:03:47 -0500 X-MC-Unique: hqsutkykOTelFTp9fMDN1A-1 X-Mimecast-MFC-AGG-ID: hqsutkykOTelFTp9fMDN1A_1772201026 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4FBC919560A6 for ; Fri, 27 Feb 2026 14:03:46 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.225.86]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5A0E530001B9; Fri, 27 Feb 2026 14:03:45 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 09/12] vu_common: Accept explicit iovec counts in vu_set_element() Date: Fri, 27 Feb 2026 15:03:27 +0100 Message-ID: <20260227140330.2216753-10-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.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yTS2erpseseDq6m7BNuktYd9lK9blnwYoD6RlOPFY60_1772201026 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 62E73TMRDR2NITNM2EWUDKL732CRR2MR X-Message-ID-Hash: 62E73TMRDR2NITNM2EWUDKL732CRR2MR 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: Previously, vu_set_element() derived the number of iovec entries from whether the pointer was NULL or not (using !!out_sg and !!in_sg). This implicitly limited each virtqueue element to at most one iovec per direction. Change the function signature to accept explicit out_num and in_num parameters, allowing callers to specify multiple iovec entries per element when needed. Update all existing call sites to pass the equivalent values (0 for NULL pointers, 1 for valid pointers). No functional change. Signed-off-by: Laurent Vivier --- tcp_vu.c | 4 ++-- vu_common.c | 5 +++-- vu_common.h | 13 ++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tcp_vu.c b/tcp_vu.c index 92667507ac9b..77d6e75496a0 100644 --- a/tcp_vu.c +++ b/tcp_vu.c @@ -87,7 +87,7 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags) hdrlen = tcp_vu_hdrlen(CONN_V6(conn)); - vu_set_element(&flags_elem[0], NULL, &flags_iov[0]); + vu_set_element(&flags_elem[0], 0, NULL, 1, &flags_iov[0]); elem_cnt = vu_collect(vdev, vq, &flags_elem[0], 1, MAX(hdrlen + sizeof(*opts), ETH_ZLEN + VNET_HLEN), NULL); @@ -149,7 +149,7 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags) nb_ack = 1; if (flags & DUP_ACK) { - vu_set_element(&flags_elem[1], NULL, &flags_iov[1]); + vu_set_element(&flags_elem[1], 0, NULL, 1, &flags_iov[1]); elem_cnt = vu_collect(vdev, vq, &flags_elem[1], 1, flags_elem[0].in_sg[0].iov_len, NULL); diff --git a/vu_common.c b/vu_common.c index a8d5fcdaea83..b6753a556049 100644 --- a/vu_common.c +++ b/vu_common.c @@ -59,12 +59,13 @@ int vu_packet_check_range(struct vdev_memory *memory, * @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) +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_set_element(&elem[i], 0, NULL, 1, &iov[i]); } /** diff --git a/vu_common.h b/vu_common.h index 41cf18936300..c1d2ce888f12 100644 --- a/vu_common.h +++ b/vu_common.h @@ -32,15 +32,18 @@ static inline void *vu_payloadv6(void *base) /** * vu_set_element() - Initialize a vu_virtq_element * @elem: Element to initialize - * @out_sg: One out iovec entry to set in elem - * @in_sg: One in iovec entry to set in elem + * @out_num: Number of outgoing iovec buffers + * @out_sg: Out iovec entry to set in elem + * @in_num: Number of incoming iovec buffers + * @in_sg: In iovec entry to set in elem */ static inline void vu_set_element(struct vu_virtq_element *elem, - struct iovec *out_sg, struct iovec *in_sg) + unsigned int out_num, struct iovec *out_sg, + unsigned int in_num, struct iovec *in_sg) { - elem->out_num = !!out_sg; + elem->out_num = out_num; elem->out_sg = out_sg; - elem->in_num = !!in_sg; + elem->in_num = in_num; elem->in_sg = in_sg; } -- 2.53.0