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=XQEXzDGq; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 6DF985A0275 for ; Mon, 09 Mar 2026 10:47:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773049677; 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=rB9D3KPmjPZwHdRS2LFsbcXK8Wzl3w6wrvmhm3BVJT8=; b=XQEXzDGqmLW15MaDON6J/DNG3djXthyWF5dwXiLZfVYzzHWM/L1CcHonfBO+6E6Ob8n9CM 68DCELKn0F67poSKbIzeUqIJrdUafTfCEURW6V/EmariMuRRkEHAuS8ONvQIA0E9rN0qkW iXyvDdCRFQOWmVH4yVAsqj4p7OpZa/8= 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-519-HKFM_812M1mA02mQ9SHmiQ-1; Mon, 09 Mar 2026 05:47:55 -0400 X-MC-Unique: HKFM_812M1mA02mQ9SHmiQ-1 X-Mimecast-MFC-AGG-ID: HKFM_812M1mA02mQ9SHmiQ_1773049674 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 B34D61956066 for ; Mon, 9 Mar 2026 09:47:54 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.226.4]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BA18C1956095; Mon, 9 Mar 2026 09:47:53 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v2 05/13] udp_vu: Move virtqueue management from udp_vu_sock_recv() to its caller Date: Mon, 9 Mar 2026 10:47:36 +0100 Message-ID: <20260309094744.1907754-6-lvivier@redhat.com> In-Reply-To: <20260309094744.1907754-1-lvivier@redhat.com> References: <20260309094744.1907754-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: AU3L_BJt4bX8ZUYDr2-GPbAMdWq-c4x9ZdctzdpwbWE_1773049674 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: S3OD3NLBIBX2EUQ4ESD4BJQVO7TALITL X-Message-ID-Hash: S3OD3NLBIBX2EUQ4ESD4BJQVO7TALITL 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: udp_vu_sock_recv() currently mixes two concerns: receiving data from the socket and managing virtqueue buffers (collecting, rewinding, releasing). This makes the function harder to reason about and couples socket I/O with virtqueue state. Move all virtqueue operations, vu_collect(), vu_init_elem(), vu_queue_rewind(), vu_set_vnethdr(), and the queue-readiness check, into udp_vu_sock_to_tap(), which is the only caller. This turns udp_vu_sock_recv() into a pure socket receive function that simply reads into the provided iov array and adjusts its length. Signed-off-by: Laurent Vivier --- udp_vu.c | 87 ++++++++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/udp_vu.c b/udp_vu.c index a39254776099..27ae93de4420 100644 --- a/udp_vu.c +++ b/udp_vu.c @@ -58,73 +58,40 @@ static size_t udp_vu_hdrlen(bool v6) /** * udp_vu_sock_recv() - Receive datagrams from socket into vhost-user buffers - * @c: Execution context * @iov: IO vector for the frame (modified on output) * @cnt: Number of IO vector entries (in/out) - * @vq: virtqueue to use to receive data * @s: Socket to receive from * @v6: Set for IPv6 connections * - * Return: size of received data, 0 if the datagram - * was discarded because the virtqueue is not ready, -1 on error + * Return: size of received data, -1 on error */ -static ssize_t udp_vu_sock_recv(const struct ctx *c, struct iovec *iov, - size_t *cnt, struct vu_virtq *vq, int s, - bool v6) +static ssize_t udp_vu_sock_recv(struct iovec *iov, size_t *cnt, int s, bool v6) { - const struct vu_dev *vdev = c->vdev; - struct msghdr msg = { 0 }; + struct iovec msg_iov[*cnt]; + struct msghdr msg = { 0 }; struct iov_tail payload; size_t hdrlen; ssize_t dlen; - int iov_cnt; - - ASSERT(!c->no_udp); - - if (!vu_queue_enabled(vq) || !vu_queue_started(vq)) { - debug("Got UDP packet, but RX virtqueue not usable yet"); - - if (recvmsg(s, &msg, MSG_DONTWAIT) < 0) - debug_perror("Failed to discard datagram"); - - *cnt = 0; - return 0; - } /* compute L2 header length */ hdrlen = udp_vu_hdrlen(v6); - vu_init_elem(elem, iov, *cnt); - - iov_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), - IP_MAX_MTU + ETH_HLEN + VNET_HLEN, NULL); - if (iov_cnt == 0) - return -1; - - payload = IOV_TAIL(iov, iov_cnt, hdrlen); + payload = IOV_TAIL(iov, *cnt, hdrlen); - struct iovec msg_iov[payload.cnt]; msg.msg_iov = msg_iov; msg.msg_iovlen = iov_tail_clone(msg.msg_iov, payload.cnt, &payload); /* read data from the socket */ dlen = recvmsg(s, &msg, 0); - if (dlen < 0) { - vu_queue_rewind(vq, iov_cnt); + if (dlen < 0) return -1; - } /* Pad short frames to ETH_ZLEN */ if (ETH_ZLEN + VNET_HLEN > dlen + hdrlen) { - iov_memset(iov, iov_cnt, dlen + hdrlen, 0, + iov_memset(iov, *cnt, dlen + hdrlen, 0, ETH_ZLEN + VNET_HLEN - (dlen + hdrlen)); } - *cnt = iov_truncate(iov, iov_cnt, dlen + hdrlen); - - vu_set_vnethdr(iov[0].iov_base, *cnt); - - /* release unused buffers */ - vu_queue_rewind(vq, iov_cnt - *cnt); + *cnt = iov_truncate(iov, *cnt, dlen + hdrlen); return dlen; } @@ -212,20 +179,48 @@ void udp_vu_sock_to_tap(const struct ctx *c, int s, int n, flow_sidx_t tosidx) bool v6 = !(inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)); struct vu_dev *vdev = c->vdev; struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; - struct iov_tail data; int i; + ASSERT(!c->no_udp); + + if (!vu_queue_enabled(vq) || !vu_queue_started(vq)) { + struct msghdr msg = { 0 }; + + debug("Got UDP packet, but RX virtqueue not usable yet"); + + for (i = 0; i < n; i++) { + if (recvmsg(s, &msg, MSG_DONTWAIT) < 0) + debug_perror("Failed to discard datagram"); + } + + return; + } + for (i = 0; i < n; i++) { size_t iov_cnt; ssize_t dlen; + int elem_cnt; - iov_cnt = VIRTQUEUE_MAX_SIZE; - dlen = udp_vu_sock_recv(c, iov_vu, &iov_cnt, vq, s, v6); - if (dlen < 0) + vu_init_elem(elem, iov_vu, ARRAY_SIZE(elem)); + + elem_cnt = vu_collect(vdev, vq, elem, ARRAY_SIZE(elem), + IP_MAX_MTU + ETH_HLEN + VNET_HLEN, NULL); + if (elem_cnt == 0) break; + iov_cnt = elem_cnt; + dlen = udp_vu_sock_recv(iov_vu, &iov_cnt, s, v6); + if (dlen < 0) { + vu_queue_rewind(vq, elem_cnt); + break; + } + + /* release unused buffers */ + vu_queue_rewind(vq, elem_cnt - iov_cnt); + if (iov_cnt > 0) { - data = IOV_TAIL(iov_vu, iov_cnt, 0); + struct iov_tail data = IOV_TAIL(iov_vu, iov_cnt, 0); + vu_set_vnethdr(iov_vu[0].iov_base, iov_cnt); udp_vu_prepare(c, &data, toside, dlen); if (*c->pcap) { udp_vu_csum(toside, &data); -- 2.53.0