From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTP id DE80C5A004E for ; Wed, 12 Jun 2024 00:10:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718143856; 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=2giAgkuUhEHaNTksyKFpexnPxUlc4MPJnsg0RX21o2U=; b=bPmtvtRpNoH8YqrSQhXB1bYrBx6GVVWkc5K12C0PGSs+7CQVFJdv1T5+BM+ioQg+8hjTVh 7/S3YPMzLL4eeg2DY5fzO/FhooFlSoZTnXajC3nXKvs9ZDwR0P4JpqDmVIpjpc0O/MEOGN jmkyY4eFzc90iuYhwWP2gXWQnQtgOsA= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-HaPadJwwNq6cQTowkr_udg-1; Tue, 11 Jun 2024 18:10:55 -0400 X-MC-Unique: HaPadJwwNq6cQTowkr_udg-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6b08b3c1c9dso14375046d6.3 for ; Tue, 11 Jun 2024 15:10:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718143854; x=1718748654; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2giAgkuUhEHaNTksyKFpexnPxUlc4MPJnsg0RX21o2U=; b=bnt15CYTLsDUP9n3cT76DUV8UZE4N/UiOFHBUfZJPgTozy54/8Zl0KN4W93m6237HX kiP5TcaluXTfLNxDenx6O1VUufeHVr7gw+bW0s02yRx7kAcMLXjxzKtsSLCuDTH7OPxC KiUpWvGzut6mXgfNZAyQWLO8AReZMBMopXQ2FgYMyotxhkKrAHca+a0qn2h54+AB/t/N 3OpAZGEYNaZxsptSCGTrTRugb8LuT3inoMfDshQW2jWbtjlTpf7YpD+TsB/yoStTDlSd 7prmk8QquWOYdR2XoOgg5JA3ijBQ9j/bNq3B2rziBE2vgtmj1t6vcFRtb7XBipE1mMl/ IYHw== X-Gm-Message-State: AOJu0YxJZVjICOG8EkOHs/D63zLIvc2FAzGQzXU+ZQLshc6d9Wce1Zvt /wsdrFJZ23Td0rZq63l1qQh8MxZyfXMP3XgwHuVsG2MFm/onvSTnWO37n/Tz/rw0V5s6bgs3zjl d07x6GGez3GGqafIMh+0sFulLW7e++sOzD0T/0790AEAC48ciJMt+3tCMN8BS/Ynj/xqQ98fdtB hwZE60Dv2YD+JmKncjEqKNvDcwFAnwU5FEPKI= X-Received: by 2002:a05:6214:501a:b0:6b0:76f1:864f with SMTP id 6a1803df08f44-6b076f188camr106119586d6.63.1718143853437; Tue, 11 Jun 2024 15:10:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhaWLcbsdk8WpjHfAvHbBIog5DjVJKavG6fbHnkqFgM0PIwmUsv1jGqqPNX3GHsu4XCt5NSA== X-Received: by 2002:a05:6214:501a:b0:6b0:76f1:864f with SMTP id 6a1803df08f44-6b076f188camr106119126d6.63.1718143852615; Tue, 11 Jun 2024 15:10:52 -0700 (PDT) Received: from maya.cloud.tilaa.com (maya.cloud.tilaa.com. [164.138.29.33]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b05c8b73c4sm50486896d6.117.2024.06.11.15.10.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2024 15:10:52 -0700 (PDT) Date: Wed, 12 Jun 2024 00:10:17 +0200 From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH v5 4/8] udp: refactor UDP header update functions Message-ID: <20240612001017.31692649@elisabeth> In-Reply-To: <20240605152129.1641658-5-lvivier@redhat.com> References: <20240605152129.1641658-1-lvivier@redhat.com> <20240605152129.1641658-5-lvivier@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: M3BTW2IUINF6GFXGM54ZSLXEAHBNHOHY X-Message-ID-Hash: M3BTW2IUINF6GFXGM54ZSLXEAHBNHOHY X-MailFrom: sbrivio@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: passt-dev@passt.top 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: On Wed, 5 Jun 2024 17:21:25 +0200 Laurent Vivier wrote: > This commit refactors the udp_update_hdr4() and udp_update_hdr6() functions > to improve code portability by replacing the udp_meta_t parameter with > more specific parameters for the IPv4 and IPv6 headers (iphdr/ipv6hdr) > and the source socket address (sockaddr_in/sockaddr_in6). > It also moves the tap_hdr_update() function call inside the udp_tap_send() > function not to have to pass the TAP header to udp_update_hdr4() and > udp_update_hdr6() > > This refactor reduces complexity by making the functions more modular and > ensuring that each function operates on more narrowly scoped data structures. > This will facilitate future backend introduction like vhost-user. > > Signed-off-by: Laurent Vivier > --- > udp.c | 60 +++++++++++++++++++++++++++++++++-------------------------- > 1 file changed, 34 insertions(+), 26 deletions(-) > > diff --git a/udp.c b/udp.c > index 3abafc994537..4295d48046a6 100644 > --- a/udp.c > +++ b/udp.c > @@ -556,7 +556,8 @@ static void udp_splice_sendfrom(const struct ctx *c, unsigned start, unsigned n, > /** > * udp_update_hdr4() - Update headers for one IPv4 datagram > * @c: Execution context > - * @bm: Pointer to udp_meta_t to update > + * @ip4h: Pre-filled IPv4 header (except for tot_len and saddr) > + * @s_in: Source socket address, filled in by recvmmsg() > * @bp: Pointer to udp_payload_t to update > * @dstport: Destination port number > * @dlen: Length of UDP payload > @@ -565,15 +566,16 @@ static void udp_splice_sendfrom(const struct ctx *c, unsigned start, unsigned n, > * Return: size of IPv4 payload (UDP header + data) > */ > static size_t udp_update_hdr4(const struct ctx *c, > - struct udp_meta_t *bm, struct udp_payload_t *bp, > + struct iphdr *ip4h, const struct sockaddr_in *s_in, > + struct udp_payload_t *bp, > in_port_t dstport, size_t dlen, > const struct timespec *now) > { > - in_port_t srcport = ntohs(bm->s_in.sa4.sin_port); > + in_port_t srcport = ntohs(s_in->sin_port); > const struct in_addr dst = c->ip4.addr_seen; > - struct in_addr src = bm->s_in.sa4.sin_addr; > + struct in_addr src = s_in->sin_addr; > size_t l4len = dlen + sizeof(bp->uh); > - size_t l3len = l4len + sizeof(bm->ip4h); > + size_t l3len = l4len + sizeof(*ip4h); Nit: while at it, it would be nice to reorder declarations from longest to shortest, as well. > > if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) && > IN4_ARE_ADDR_EQUAL(&src, &c->ip4.dns_host) && srcport == 53 && > @@ -594,24 +596,24 @@ static size_t udp_update_hdr4(const struct ctx *c, > src = c->ip4.gw; > } > > - bm->ip4h.tot_len = htons(l3len); > - bm->ip4h.daddr = dst.s_addr; > - bm->ip4h.saddr = src.s_addr; > - bm->ip4h.check = csum_ip4_header(l3len, IPPROTO_UDP, src, dst); > + ip4h->tot_len = htons(l3len); > + ip4h->daddr = dst.s_addr; > + ip4h->saddr = src.s_addr; > + ip4h->check = csum_ip4_header(l3len, IPPROTO_UDP, src, dst); > > - bp->uh.source = bm->s_in.sa4.sin_port; > + bp->uh.source = s_in->sin_port; > bp->uh.dest = htons(dstport); > bp->uh.len = htons(l4len); > csum_udp4(&bp->uh, src, dst, bp->data, dlen); > > - tap_hdr_update(&bm->taph, l3len + sizeof(udp4_eth_hdr)); > return l4len; > } > > /** > * udp_update_hdr6() - Update headers for one IPv6 datagram > * @c: Execution context > - * @bm: Pointer to udp_meta_t to update > + * @ip6h: Pre-filled IPv6 header (except for payload_len and addresses) > + * @s_in: Source socket address, filled in by recvmmsg() > * @bp: Pointer to udp_payload_t to update > * @dstport: Destination port number > * @dlen: Length of UDP payload > @@ -620,13 +622,14 @@ static size_t udp_update_hdr4(const struct ctx *c, > * Return: size of IPv6 payload (UDP header + data) > */ > static size_t udp_update_hdr6(const struct ctx *c, > - struct udp_meta_t *bm, struct udp_payload_t *bp, > + struct ipv6hdr *ip6h, struct sockaddr_in6 *s_in6, > + struct udp_payload_t *bp, > in_port_t dstport, size_t dlen, > const struct timespec *now) > { > - const struct in6_addr *src = &bm->s_in.sa6.sin6_addr; > + const struct in6_addr *src = &s_in6->sin6_addr; > const struct in6_addr *dst = &c->ip6.addr_seen; > - in_port_t srcport = ntohs(bm->s_in.sa6.sin6_port); > + in_port_t srcport = ntohs(s_in6->sin6_port); Same here. > uint16_t l4len = dlen + sizeof(bp->uh); > > if (IN6_IS_ADDR_LINKLOCAL(src)) { > @@ -663,19 +666,18 @@ static size_t udp_update_hdr6(const struct ctx *c, > > } > > - bm->ip6h.payload_len = htons(l4len); > - bm->ip6h.daddr = *dst; > - bm->ip6h.saddr = *src; > - bm->ip6h.version = 6; > - bm->ip6h.nexthdr = IPPROTO_UDP; > - bm->ip6h.hop_limit = 255; > + ip6h->payload_len = htons(l4len); > + ip6h->daddr = *dst; > + ip6h->saddr = *src; > + ip6h->version = 6; > + ip6h->nexthdr = IPPROTO_UDP; > + ip6h->hop_limit = 255; > > - bp->uh.source = bm->s_in.sa6.sin6_port; > + bp->uh.source = s_in6->sin6_port; > bp->uh.dest = htons(dstport); > - bp->uh.len = bm->ip6h.payload_len; > + bp->uh.len = ip6h->payload_len; > csum_udp6(&bp->uh, src, dst, bp->data, dlen); > > - tap_hdr_update(&bm->taph, l4len + sizeof(bm->ip6h) + sizeof(udp6_eth_hdr)); > return l4len; > } > > @@ -708,11 +710,17 @@ static void udp_tap_send(const struct ctx *c, > size_t l4len; > > if (v6) { > - l4len = udp_update_hdr6(c, bm, bp, dstport, > + l4len = udp_update_hdr6(c, &bm->ip6h, > + &bm->s_in.sa6, bp, dstport, > udp6_l2_mh_sock[i].msg_len, now); > + tap_hdr_update(&bm->taph, l4len + sizeof(bm->ip6h) + > + sizeof(udp6_eth_hdr)); You're summing sizeof(udp6_eth_hdr) to l4len + sizeof(bm->ip6h), so this should be aligned as follows: tap_hdr_update(&bm->taph, l4len + sizeof(bm->ip6h) + sizeof(udp6_eth_hdr)); > } else { > - l4len = udp_update_hdr4(c, bm, bp, dstport, > + l4len = udp_update_hdr4(c, &bm->ip4h, > + &bm->s_in.sa4, bp, dstport, > udp4_l2_mh_sock[i].msg_len, now); > + tap_hdr_update(&bm->taph, l4len + sizeof(bm->ip4h) + > + sizeof(udp4_eth_hdr)); Same here: tap_hdr_update(&bm->taph, l4len + sizeof(bm->ip4h) + sizeof(udp4_eth_hdr)); > } > tap_iov[i][UDP_IOV_PAYLOAD].iov_len = l4len; > } -- Stefano