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=Yu9D+9Kp; 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 994EF5A026E for ; Fri, 27 Mar 2026 18:58:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774634331; 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=iTRDp7+hDZTF3+F+kPQLX2O3psGR/erkN4Mv52N3a2I=; b=Yu9D+9KpxctiDQfB+6mTqBp9wm9bNzpVhTnoVSyKguw2rT48Kp2GOF4D5An6sRj095HMLT mfh00z3k4X/G5Z1ik2qQlEHpwFtRiRDeep6M2LAsL+okQ/95GeGfb5qpZQqQxt0IWa5RaS yEEQjeo0lmhY4dQ8rnWbaein7Fb9N+Q= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-CIbzJnpvPOy3L1GqkKdp2A-1; Fri, 27 Mar 2026 13:58:50 -0400 X-MC-Unique: CIbzJnpvPOy3L1GqkKdp2A-1 X-Mimecast-MFC-AGG-ID: CIbzJnpvPOy3L1GqkKdp2A_1774634329 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 541A418002CA for ; Fri, 27 Mar 2026 17:58:49 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.96]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B5DD1800351; Fri, 27 Mar 2026 17:58:48 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v5 8/8] udp: Pass iov_tail to udp_update_hdr4()/udp_update_hdr6() Date: Fri, 27 Mar 2026 18:58:34 +0100 Message-ID: <20260327175834.831995-9-lvivier@redhat.com> In-Reply-To: <20260327175834.831995-1-lvivier@redhat.com> References: <20260327175834.831995-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8FrIYbXaUMvvgLmDfIcZsPowbircNCD2k6oAUjZF1BE_1774634329 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: NTEZWTOQBZSX4ZY5DRH3JKAMJC4IZJIK X-Message-ID-Hash: NTEZWTOQBZSX4ZY5DRH3JKAMJC4IZJIK 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: Change udp_update_hdr4() and udp_update_hdr6() to take an iov_tail pointing at the UDP frame instead of a contiguous udp_payload_t buffer and explicit data length. This lets vhost-user pass scatter-gather virtqueue buffers directly without an intermediate copy. The UDP header is built into a local struct udphdr and written back with IOV_PUSH_HEADER(). On the tap side, udp_tap_prepare() wraps the existing udp_payload_t in a two-element iov to match the new interface. Signed-off-by: Laurent Vivier --- iov.c | 1 - udp.c | 81 +++++++++++++++++++++++++++----------------------- udp_internal.h | 10 +++---- udp_vu.c | 80 ++++++++++++++++++++++++++----------------------- 4 files changed, 89 insertions(+), 83 deletions(-) diff --git a/iov.c b/iov.c index 3b7174db3352..23cc247fd6f2 100644 --- a/iov.c +++ b/iov.c @@ -316,7 +316,6 @@ void *iov_peek_header_(struct iov_tail *tail, void *v, size_t len, size_t align) * * Return: number of bytes written */ -/* cppcheck-suppress unusedFunction */ size_t iov_push_header_(struct iov_tail *tail, const void *v, size_t len) { size_t l; diff --git a/udp.c b/udp.c index 1fc5a42c5ca7..86b745cecb42 100644 --- a/udp.c +++ b/udp.c @@ -255,21 +255,20 @@ static void udp_iov_init(const struct ctx *c) /** * udp_update_hdr4() - Update headers for one IPv4 datagram * @ip4h: Pre-filled IPv4 header (except for tot_len and saddr) - * @bp: Pointer to udp_payload_t to update + * @payload: iov_tail with UDP payload to update * @toside: Flowside for destination side - * @dlen: Length of UDP payload * @no_udp_csum: Do not set UDP checksum * * Return: size of IPv4 payload (UDP header + data) */ -size_t udp_update_hdr4(struct iphdr *ip4h, struct udp_payload_t *bp, - const struct flowside *toside, size_t dlen, - bool no_udp_csum) +size_t udp_update_hdr4(struct iphdr *ip4h, struct iov_tail *payload, + const struct flowside *toside, bool no_udp_csum) { const struct in_addr *src = inany_v4(&toside->oaddr); const struct in_addr *dst = inany_v4(&toside->eaddr); - size_t l4len = dlen + sizeof(bp->uh); + size_t l4len = iov_tail_size(payload); size_t l3len = l4len + sizeof(*ip4h); + struct udphdr uh; assert(src && dst); @@ -278,19 +277,18 @@ size_t udp_update_hdr4(struct iphdr *ip4h, struct udp_payload_t *bp, ip4h->saddr = src->s_addr; ip4h->check = csum_ip4_header(l3len, IPPROTO_UDP, *src, *dst); - bp->uh.source = htons(toside->oport); - bp->uh.dest = htons(toside->eport); - bp->uh.len = htons(l4len); + uh.source = htons(toside->oport); + uh.dest = htons(toside->eport); + uh.len = htons(l4len); if (no_udp_csum) { - bp->uh.check = 0; + uh.check = 0; } else { - const struct iovec iov = { - .iov_base = bp->data, - .iov_len = dlen - }; - struct iov_tail data = IOV_TAIL(&iov, 1, 0); - csum_udp4(&bp->uh, *src, *dst, &data); + struct iov_tail data = *payload; + + IOV_DROP_HEADER(&data, struct udphdr); + csum_udp4(&uh, *src, *dst, &data); } + IOV_PUSH_HEADER(payload, uh); return l4len; } @@ -299,18 +297,17 @@ size_t udp_update_hdr4(struct iphdr *ip4h, struct udp_payload_t *bp, * udp_update_hdr6() - Update headers for one IPv6 datagram * @ip6h: Pre-filled IPv6 header (except for payload_len and * addresses) - * @bp: Pointer to udp_payload_t to update + * @payload: iov_tail with UDP payload to update * @toside: Flowside for destination side - * @dlen: Length of UDP payload * @no_udp_csum: Do not set UDP checksum * * Return: size of IPv6 payload (UDP header + data) */ -size_t udp_update_hdr6(struct ipv6hdr *ip6h, struct udp_payload_t *bp, - const struct flowside *toside, size_t dlen, - bool no_udp_csum) +size_t udp_update_hdr6(struct ipv6hdr *ip6h, struct iov_tail *payload, + const struct flowside *toside, bool no_udp_csum) { - uint16_t l4len = dlen + sizeof(bp->uh); + uint16_t l4len = iov_tail_size(payload); + struct udphdr uh; ip6h->payload_len = htons(l4len); ip6h->daddr = toside->eaddr.a6; @@ -319,23 +316,24 @@ size_t udp_update_hdr6(struct ipv6hdr *ip6h, struct udp_payload_t *bp, ip6h->nexthdr = IPPROTO_UDP; ip6h->hop_limit = 255; - bp->uh.source = htons(toside->oport); - bp->uh.dest = htons(toside->eport); - bp->uh.len = ip6h->payload_len; + uh.source = htons(toside->oport); + uh.dest = htons(toside->eport); + uh.len = htons(l4len); if (no_udp_csum) { /* 0 is an invalid checksum for UDP IPv6 and dropped by - * the kernel stack, even if the checksum is disabled by virtio - * flags. We need to put any non-zero value here. + * the kernel stack, even if the checksum is disabled + * by virtio flags. We need to put any non-zero value + * here. */ - bp->uh.check = 0xffff; + uh.check = 0xffff; } else { - const struct iovec iov = { - .iov_base = bp->data, - .iov_len = dlen - }; - struct iov_tail data = IOV_TAIL(&iov, 1, 0); - csum_udp6(&bp->uh, &toside->oaddr.a6, &toside->eaddr.a6, &data); + struct iov_tail data = *payload; + + IOV_DROP_HEADER(&data, struct udphdr); + csum_udp6(&uh, &toside->oaddr.a6, &toside->eaddr.a6, + &data); } + IOV_PUSH_HEADER(payload, uh); return l4len; } @@ -374,12 +372,19 @@ static void udp_tap_prepare(const struct mmsghdr *mmh, struct ethhdr *eh = (*tap_iov)[UDP_IOV_ETH].iov_base; struct udp_payload_t *bp = &udp_payload[idx]; struct udp_meta_t *bm = &udp_meta[idx]; + struct iovec iov[2]; + struct iov_tail payload = IOV_TAIL(iov, ARRAY_SIZE(iov), 0); size_t l4len, l2len; + iov[0].iov_base = &bp->uh; + iov[0].iov_len = sizeof(bp->uh); + iov[1].iov_base = bp->data; + iov[1].iov_len = mmh[idx].msg_len; + eth_update_mac(eh, NULL, tap_omac); if (!inany_v4(&toside->eaddr) || !inany_v4(&toside->oaddr)) { - l4len = udp_update_hdr6(&bm->ip6h, bp, toside, - mmh[idx].msg_len, no_udp_csum); + l4len = udp_update_hdr6(&bm->ip6h, &payload, toside, + no_udp_csum); l2len = MAX(l4len + sizeof(bm->ip6h) + ETH_HLEN, ETH_ZLEN); tap_hdr_update(&bm->taph, l2len); @@ -387,8 +392,8 @@ static void udp_tap_prepare(const struct mmsghdr *mmh, eh->h_proto = htons_constant(ETH_P_IPV6); (*tap_iov)[UDP_IOV_IP] = IOV_OF_LVALUE(bm->ip6h); } else { - l4len = udp_update_hdr4(&bm->ip4h, bp, toside, - mmh[idx].msg_len, no_udp_csum); + l4len = udp_update_hdr4(&bm->ip4h, &payload, toside, + no_udp_csum); l2len = MAX(l4len + sizeof(bm->ip4h) + ETH_HLEN, ETH_ZLEN); tap_hdr_update(&bm->taph, l2len); diff --git a/udp_internal.h b/udp_internal.h index 64e457748324..d235746aa3e5 100644 --- a/udp_internal.h +++ b/udp_internal.h @@ -25,12 +25,10 @@ struct udp_payload_t { } __attribute__ ((packed, aligned(__alignof__(unsigned int)))); #endif -size_t udp_update_hdr4(struct iphdr *ip4h, struct udp_payload_t *bp, - const struct flowside *toside, size_t dlen, - bool no_udp_csum); -size_t udp_update_hdr6(struct ipv6hdr *ip6h, struct udp_payload_t *bp, - const struct flowside *toside, size_t dlen, - bool no_udp_csum); +size_t udp_update_hdr4(struct iphdr *ip4h, struct iov_tail *payload, + const struct flowside *toside, bool no_udp_csum); +size_t udp_update_hdr6(struct ipv6hdr *ip6h, struct iov_tail *payload, + const struct flowside *toside, bool no_udp_csum); void udp_sock_fwd(const struct ctx *c, int s, int rule_hint, uint8_t frompif, in_port_t port, const struct timespec *now); diff --git a/udp_vu.c b/udp_vu.c index ea536e2ad240..cc09fe0fa511 100644 --- a/udp_vu.c +++ b/udp_vu.c @@ -91,43 +91,52 @@ static ssize_t udp_vu_sock_recv(struct iovec *iov, size_t *cnt, int s, bool v6) /** * udp_vu_prepare() - Prepare the packet header * @c: Execution context - * @iov: IO vector for the frame (including vnet header) + * @data: IO vector tail for the frame, + * on return, points to the L3 frame * @toside: Address information for one side of the flow - * @dlen: Packet data length * * Return: Layer-4 length */ -static size_t udp_vu_prepare(const struct ctx *c, const struct iovec *iov, - const struct flowside *toside, ssize_t dlen) +static size_t udp_vu_prepare(const struct ctx *c, struct iov_tail *data, + const struct flowside *toside) { - struct ethhdr *eh; + bool ipv4 = inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr); + struct ethhdr eh; size_t l4len; /* ethernet header */ - eh = vu_eth(iov[0].iov_base); + memcpy(eh.h_dest, c->guest_mac, sizeof(eh.h_dest)); + memcpy(eh.h_source, c->our_tap_mac, sizeof(eh.h_source)); - memcpy(eh->h_dest, c->guest_mac, sizeof(eh->h_dest)); - memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source)); + if (ipv4) + eh.h_proto = htons(ETH_P_IP); + else + eh.h_proto = htons(ETH_P_IPV6); + IOV_PUSH_HEADER(data, eh); /* initialize header */ - if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) { - struct iphdr *iph = vu_ip(iov[0].iov_base); - struct udp_payload_t *bp = vu_payloadv4(iov[0].iov_base); + if (ipv4) { + struct iov_tail udp_frame; + struct iphdr iph; - eh->h_proto = htons(ETH_P_IP); + iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_UDP); - *iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_UDP); + udp_frame = *data; + IOV_DROP_HEADER(&udp_frame, struct iphdr); + l4len = udp_update_hdr4(&iph, &udp_frame, toside, true); - l4len = udp_update_hdr4(iph, bp, toside, dlen, true); + IOV_PUSH_HEADER(data, iph); } else { - struct ipv6hdr *ip6h = vu_ip(iov[0].iov_base); - struct udp_payload_t *bp = vu_payloadv6(iov[0].iov_base); + struct iov_tail udp_frame; + struct ipv6hdr ip6h; - eh->h_proto = htons(ETH_P_IPV6); + ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_UDP); - *ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_UDP); + udp_frame = *data; + IOV_DROP_HEADER(&udp_frame, struct ipv6hdr); + l4len = udp_update_hdr6(&ip6h, &udp_frame, toside, true); - l4len = udp_update_hdr6(ip6h, bp, toside, dlen, true); + IOV_PUSH_HEADER(data, ip6h); } return l4len; @@ -136,27 +145,21 @@ static size_t udp_vu_prepare(const struct ctx *c, const struct iovec *iov, /** * udp_vu_csum() - Calculate and set checksum for a UDP packet * @toside: Address information for one side of the flow - * @iov: IO vector for the frame - * @cnt: Number of IO vector entries + * @data: IO vector tail for the L3 frame */ -static void udp_vu_csum(const struct flowside *toside, const struct iovec *iov, - size_t cnt) +static void udp_vu_csum(const struct flowside *toside, struct iov_tail *data) { const struct in_addr *src4 = inany_v4(&toside->oaddr); const struct in_addr *dst4 = inany_v4(&toside->eaddr); - char *base = iov[0].iov_base; - struct udp_payload_t *bp; - struct iov_tail data; - - if (src4 && dst4) { - bp = vu_payloadv4(base); - data = IOV_TAIL(iov, cnt, (char *)&bp->data - base); - csum_udp4(&bp->uh, *src4, *dst4, &data); - } else { - bp = vu_payloadv6(base); - data = IOV_TAIL(iov, cnt, (char *)&bp->data - base); - csum_udp6(&bp->uh, &toside->oaddr.a6, &toside->eaddr.a6, &data); - } + struct udphdr *uh, uh_storage; + bool ipv4 = src4 && dst4; + + uh = IOV_REMOVE_HEADER(data, uh_storage); + + if (ipv4) + csum_udp4(uh, *src4, *dst4, data); + else + csum_udp6(uh, &toside->oaddr.a6, &toside->eaddr.a6, data); } /** @@ -220,9 +223,10 @@ void udp_vu_sock_to_tap(const struct ctx *c, int s, int n, flow_sidx_t tosidx) vu_queue_rewind(vq, elem_cnt - elem_used); if (iov_cnt > 0) { - udp_vu_prepare(c, iov_vu, toside, dlen); + struct iov_tail data = IOV_TAIL(iov_vu, iov_cnt, VNET_HLEN); + udp_vu_prepare(c, &data, toside); if (*c->pcap) { - udp_vu_csum(toside, iov_vu, iov_cnt); + udp_vu_csum(toside, &data); pcap_iov(iov_vu, iov_cnt, VNET_HLEN); } vu_flush(vdev, vq, elem, elem_used); -- 2.53.0