From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-b4-smtp.messagingengine.com (fout-b4-smtp.messagingengine.com [202.12.124.147]) (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 4F66D29D27D for ; Thu, 11 Jun 2026 19:30:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.147 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781206249; cv=none; b=J14ihh+9Stahh8soVEZpjpTaSs4XReR/CdFkJSV/57v3sKXu8X433/X7vNmyaHZSd6VcDN8wcVRMWH/Oq60xK8wqANAyMN9t117aJtsW61aZDt06LbCUIolIYVEo+j+ILa8j3YbpG56KT+Ol3eszsRBfTTPIMyO4uYtM0vuMd5w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781206249; c=relaxed/simple; bh=RycTQed2qe7YqMN8Z/FqkpT8XMOEU6MRHLtzd84sB5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gXkva3zRg0XlaIDzyc3rdmAGp9tp+ATPWX9Sb/QE3RsShJgOP9ZT3nUtb0lLdpLA9ENBuJzZ6KYN9bppa/i1pF3oSC8wWsEJCMMMHLTz3EN0gmEPDi1u5XsarRy5+ua3kqCT6hlNz7sLnLwDfZAscg00rlcgZ3LoRW+t7amqNNc= 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=Oet3HBcJ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=f3fcHUMm; arc=none smtp.client-ip=202.12.124.147 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="Oet3HBcJ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="f3fcHUMm" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 587171D0007C; Thu, 11 Jun 2026 15:30:47 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Thu, 11 Jun 2026 15:30:47 -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=fm1; t=1781206247; x= 1781292647; bh=/zFDrdGt2RoQKbV2SX9yrdSp0RayT1tm2EAry68EegQ=; b=O et3HBcJhZ6hVRcBVuNc0p9FTeOUmpdH+6ieD0OLc5H3GvRy4MFvIGMCyPQqxtfAu B+PqqWXRAZv5zzIq8zPcLhq/zVhF/GlDxxVi4DIib/0Hk5nq55J0LVv6sBXLJt9U prwN50JeFjRR5OzNcikORx0NmhF1r32sidqoQWv3F8clW3O5E6HQk3/1CuePc6Nt 0a5+axZqR0ZLxndaW1/rh1ybrk3fBiMZIfzamVFfIEQQD6D82zM3ozXu7WH7lZAu OFTRKLOWk5P4EHsrZqo+IW4N8ljIzFWToPag0wJxV8Yb4mCRiSI0+5XYAsN2AjQo 4mXiNFU7MW+Msx6yKNS6g== 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=fm1; t=1781206247; x=1781292647; bh=/ zFDrdGt2RoQKbV2SX9yrdSp0RayT1tm2EAry68EegQ=; b=f3fcHUMmmKPrj/eyj P3SOtVIBI4Wkale8kIymbYT452gt7rsBJODhepAeHsdVbOzfpy2fP1dk77iR4T9Z i+PRheZTzgPP+ptgotMxcaLNDW7VvpZWdytdiGjWbMGpLWiX9QMTVPZVYegWCEc9 DBOSqbhSufKAyKOP+HV0WbA1sL6jtwl51pvJ5+eguGp8JNTmqCKB88cdq/Q1O+5h CPOWPy0byMbRqktITpvBKHqXTW3FQLkm0JJY/XEoweS9OvK+YwgXpchgmoQqWrN5 0tAS6zcsEhQqHr2uNkQfCWGyLriiViYWo4v3+gkxsTg1VxPz77BzI0nNQ3hqLjye PsY3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEiC3WdhRi6lmpvrurG1zsBSCtiqP0WNrqAbghd5WJJ5VA7rTMHapznV9StKJaapp RCFRaoACDzmV+WD4oXwzhVyqAYewgJwskY7+pzj89kGgG6Z5gh5qwjqnnl1xPZ9xw9XTL3 6h0yQhC9JWLW9+mdqRsn8FaDYVGkm04cbHUvo+O2iHxAKiVWkwOc7fmUFydM3Q3w8Zl56u v+GK2GCObb3b4V4RDlvLsMODXfS6N+5oUdni3ao7DuI/y5kjlxXKXH9JMIpsen+KUYBZ/y QM6GhQcs+90PA2n4UkkP5wtLFs/TKnXuu0mgwtrACzJAoOCVpXiPf0MWRzXp2RALkPmoHA RRPiHb3lFcIB5A0QEfckeSWXeS5ielAwyyPMH/80hZXSMyEMPawYa6ZM9MeiAXJ8wWFNbh 6zQ0XUb8GRcKxb4JnuvdpSjdBda7mb2HKcNQcPZQ0WDNReuIBvuofMyJ85FIH4dsM5HLbW s9ixvLab9ueVIg4Nb/7WRyFiWZFN2t/711utHPshqW2yTPzetOgx9Tb3sXDCDMGkEBsAwR Ef8JMn4f9Jx0RJoFH2New2MmTKBSvz36HmbNLAPLHWwszlzWxgxpZd17lwpdKtYTHREIoA CLQG9IMd1+o6sIC5bCVq7vrfFxbbaeXuqN1bK/Cran80P6p7aDxMuktVjvZQ X-ME-Proxy: Feedback-ID: i559e4809:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 11 Jun 2026 15:30:45 -0400 (EDT) From: Alice Mikityanska To: Daniel Borkmann , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Xin Long , Willem de Bruijn , 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 v7 05/11] udp: Support BIG TCP GSO packets where they can occur Date: Thu, 11 Jun 2026 21:29:49 +0200 Message-ID: <20260611192955.604661-6-alice.kernel@fastmail.im> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260611192955.604661-1-alice.kernel@fastmail.im> References: <20260611192955.604661-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. Use udp_get_len in udp_validate_len to treat BIG TCP packets as valid. Signed-off-by: Alice Mikityanska Reviewed-by: Willem de Bruijn --- 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 | 2 +- net/psp/psp_main.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c index a50740d0f288..aef3ce1dec7a 100644 --- a/net/ipv4/fou_core.c +++ b/net/ipv4/fou_core.c @@ -1040,7 +1040,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 ae3ed2c00ec3..c51ebd83a476 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c @@ -1100,7 +1100,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 8a5675983e7c..a7edfefd6fd1 100644 --- a/net/netfilter/nf_conntrack_proto_udp.c +++ b/net/netfilter/nf_conntrack_proto_udp.c @@ -45,7 +45,7 @@ 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 = udp_get_len(skb, hdr, dataoff); unsigned int skblen = skb->len - dataoff; if (udplen > skblen || udplen < sizeof(*hdr)) diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index ce7a0ade450f..0475e680651d 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -211,7 +211,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.54.0