From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fhigh-a1-smtp.messagingengine.com (fhigh-a1-smtp.messagingengine.com [103.168.172.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEC283D9DB1 for ; Fri, 10 Apr 2026 15:10:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.152 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775833825; cv=none; b=AAfAqmpk+OFplQ9duDjsqS2avBzZ5fPl4MMTm0AoFFdVmLJqNaOiGlLmXafzfs+b0vhwURp83A5u7ITyYCQpHgCeAlAjMvYLb7w/xPenWRVOKb3FXr6Uav8p7c7McJCpwn609F6jayFrw+OkjRuAsS72yqR3J90HLwz0Eir8nH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775833825; c=relaxed/simple; bh=05kZma9TJd4vaRLhT3A4r41/zDKS+nuhZXQ22vVu9R0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lcgN2VNxIofoW1JGckpFFNk9efX272DoIlkujuYyAUQHMOTIB9ucXNWCjeYe4NIEzDtmAOF/JkThKZWKF7h4ZSeqUSuZAXCF91xAgu6Jr8DheEeg95pePt6wrMHM6Wwqs3zYNe7uV6979gAm6CHrddVRusPscv6a4l65Hl8/6XQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.im; spf=pass smtp.mailfrom=fastmail.im; dkim=pass (2048-bit key) header.d=fastmail.im header.i=@fastmail.im header.b=Rkwgy6KH; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=fxF0yrTL; arc=none smtp.client-ip=103.168.172.152 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.im header.i=@fastmail.im header.b="Rkwgy6KH"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="fxF0yrTL" Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 414ED140019B; Fri, 10 Apr 2026 11:10:23 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Fri, 10 Apr 2026 11:10:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.im; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1775833823; x= 1775920223; bh=sU+OoW4t49MbGByngP4wUKu77h/eiJRl9wjwsS33JDs=; b=R kwgy6KHNeJ0D8ZLv68tLMsJubdwIiTK3FehvGTRZZtuaU3pzfOpfAEzC7AnucALS rxN4ZIrrenIHdISKHwXB0Bc+x3TC1i5fdoCl0aYcahZuCZf7xmF3g3/OLq0JSVU6 z5hDIFjRQM/THbKgalUxz04cqzQH9VEVaH5dNQaMaCgtu8QVBVaPC9D8Pjo4jkVH LfW2iFRjr6W1Utx0cvOSjVs+qtntAKJt0O6FJ1hgpV3L26LEwGT4iQYGeAN/Fs57 t8yX8OOTZvCgTRWlxu6zxQOWHGh7c99wICp5ipVhDkn50XtT9Xe80YKCRAR6uLQ3 avG8svFZb5f0vI8LeLKGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1775833823; x=1775920223; bh=s U+OoW4t49MbGByngP4wUKu77h/eiJRl9wjwsS33JDs=; b=fxF0yrTLeZ599LGfp +TVMfMitjHL/XJrsv8neE//CwO4G8yXGacmvt9Q7mo6udIuUT5uk32oIjTIDdeZ3 i/S/UD/5hI8uQT4D5s0jXKg6Lgk+/ygsbZgXZoS/XXNW30tA2RIg0NmGC/CyINzi JNNaXP7jKjoTzAZBS99X+2y28/Tg1ZgDEVksleQ6xgcR3stD8DP4XxVRg+9CT/U6 8Lz4o2Utakvpq5pS9/YiH4ntR1AjvEEqQbH/sqWbLBMjuGiLzUCuDQhxt997+p0H Z0g4MklYGqB8wEDMDfcQX3Z8nGHtEV0jw1Hluqnp/YxmXDfqS30RGMfQUW6+ujZo xDXcQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddvleejfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeetlhhitggvucfo ihhkihhthigrnhhskhgruceorghlihgtvgdrkhgvrhhnvghlsehfrghsthhmrghilhdrih hmqeenucggtffrrghtthgvrhhnpeetffeljeefvdfhheeijeelgfekleejveeugeegveet hffguefhudffgeekvddttdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmh grihhlfhhrohhmpegrlhhitggvrdhkvghrnhgvlhesfhgrshhtmhgrihhlrdhimhdpnhgs pghrtghpthhtohepudeipdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegurghnih gvlhesihhoghgvrghrsghogidrnhgvthdprhgtphhtthhopegurghvvghmsegurghvvghm lhhofhhtrdhnvghtpdhrtghpthhtohepvgguuhhmrgiivghtsehgohhoghhlvgdrtghomh dprhgtphhtthhopehkuhgsrgeskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepphgrsggv nhhisehrvgguhhgrthdrtghomhdprhgtphhtthhopehluhgtihgvnhdrgihinhesghhmrg hilhdrtghomhdprhgtphhtthhopeifihhllhgvmhguvggsrhhuihhjnhdrkhgvrhhnvghl sehgmhgrihhlrdgtohhmpdhrtghpthhtohepughsrghhvghrnheskhgvrhhnvghlrdhorh hgpdhrtghpthhtoheprhgriihorhessghlrggtkhifrghllhdrohhrgh X-ME-Proxy: Feedback-ID: i559e4809:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Apr 2026 11:10:22 -0400 (EDT) From: Alice Mikityanska To: Daniel Borkmann , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Xin Long , Willem de Bruijn , David Ahern , Nikolay Aleksandrov Cc: Shuah Khan , Stanislav Fomichev , Andrew Lunn , Simon Horman , Florian Westphal , netdev@vger.kernel.org, Alice Mikityanska Subject: [PATCH net-next v3 07/12] udp: Support BIG TCP GSO packets where they can occur Date: Fri, 10 Apr 2026 18:09:38 +0300 Message-ID: <20260410150943.993350-8-alice.kernel@fastmail.im> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410150943.993350-1-alice.kernel@fastmail.im> References: <20260410150943.993350-1-alice.kernel@fastmail.im> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Alice Mikityanska Wherever a GSO packet can occur, and its length is used to fill the UDP header, use udp_set_len that assigns 0 if the length doesn't fit 16 bits, so that the packet can be properly parsed and segmented later, instead of having truncated length. Signed-off-by: Alice Mikityanska --- net/ipv4/fou_core.c | 2 +- net/ipv6/fou6.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 2 +- net/netfilter/nf_conntrack_proto_udp.c | 4 +++- net/netfilter/nf_nat_helper.c | 2 +- net/psp/psp_main.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c index e66e10a2c33f..d128f0f6e3ae 100644 --- a/net/ipv4/fou_core.c +++ b/net/ipv4/fou_core.c @@ -1043,7 +1043,7 @@ static void fou_build_udp(struct sk_buff *skb, struct ip_tunnel_encap *e, uh->dest = e->dport; uh->source = sport; - udp_set_len_short(uh, skb->len); + udp_set_len(uh, skb->len); udp_set_csum(!(e->flags & TUNNEL_ENCAP_FLAG_CSUM), skb, fl4->saddr, fl4->daddr, skb->len); diff --git a/net/ipv6/fou6.c b/net/ipv6/fou6.c index 588929409241..4b659ca60ba9 100644 --- a/net/ipv6/fou6.c +++ b/net/ipv6/fou6.c @@ -30,7 +30,7 @@ static void fou6_build_udp(struct sk_buff *skb, struct ip_tunnel_encap *e, uh->dest = e->dport; uh->source = sport; - udp_set_len_short(uh, skb->len); + udp_set_len(uh, skb->len); udp6_set_csum(!(e->flags & TUNNEL_ENCAP_FLAG_CSUM6), skb, &fl6->saddr, &fl6->daddr, skb->len); diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index b460998e348e..08b0b5bfe4ec 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c @@ -1089,7 +1089,7 @@ ipvs_gue_encap(struct net *net, struct sk_buff *skb, dport = cp->dest->tun_port; udph->dest = dport; udph->source = sport; - udp_set_len_short(udph, skb->len); + udp_set_len(udph, skb->len); udph->check = 0; *next_protocol = IPPROTO_UDP; diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c index e9bd1632304f..ca7d259ded8b 100644 --- a/net/netfilter/nf_conntrack_proto_udp.c +++ b/net/netfilter/nf_conntrack_proto_udp.c @@ -45,9 +45,11 @@ static bool udp_validate_len(struct sk_buff *skb, const struct udphdr *hdr, unsigned int dataoff) { - unsigned int udplen = udp_get_len_short(hdr); + unsigned int udplen = ntohs(hdr->len); unsigned int skblen = skb->len - dataoff; + if (!udplen && skblen >= GRO_LEGACY_MAX_SIZE) + return true; if (udplen > skblen || udplen < sizeof(*hdr)) return false; return true; diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c index 3853f41db499..ec34a2f4baa8 100644 --- a/net/netfilter/nf_nat_helper.c +++ b/net/netfilter/nf_nat_helper.c @@ -161,7 +161,7 @@ nf_nat_mangle_udp_packet(struct sk_buff *skb, /* update the length of the UDP packet */ datalen = skb->len - protoff; - udp_set_len_short(udph, datalen); + udp_set_len(udph, datalen); /* fix udp checksum if udp checksum was previously calculated */ if (!udph->check && skb->ip_summed != CHECKSUM_PARTIAL) diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index 47491b0ce4c9..0ccd96ab99ad 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -207,7 +207,7 @@ static void psp_write_headers(struct net *net, struct sk_buff *skb, __be32 spi, uh->source = udp_flow_src_port(net, skb, 0, 0, false); } uh->check = 0; - udp_set_len_short(uh, udp_len); + udp_set_len(uh, udp_len); psph->nexthdr = IPPROTO_TCP; psph->hdrlen = PSP_HDRLEN_NOOPT; -- 2.53.0