From nobody Thu Oct 2 16:32:30 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BD5D278170 for ; Mon, 15 Sep 2025 11:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757936457; cv=none; b=N9g38G4HUKCFnJ6LUcxY5wNCQ1ty0E3PcfnjXZlWrJ7dXzJs5DcK/aR2d+MQ6KZtoMmS/BlVeVhaSKC64PgNkrZ7ocgWCmxrMkGYBXgd2iC7OBnv2ymnHZpW+N6P7B9ixp9FCPJ0/GEK+yt4UwE4AUtuFhUf92vu/VJqmQNQV+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757936457; c=relaxed/simple; bh=bNIaNEm4LT6TFP6CWRAKFGRqH4Wptaj+KdxK6aWaJOQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ClKKMyBmjSDVZAV+zfgA+UIUCO1OTFrJr+C7n/nT2KJVYjj7QpD/bXMMUqQvljr7+L631Q9xpahJu1/26U66Ap9Gulf9xORw86Nxxaa4l+W1hS1Er8qFavV7MmqDGkqYCcqLgiF4vt+fsOOsNNK68hB1X4HhPTppulr9ZTBsSvs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YlGzuOcP; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YlGzuOcP" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3b9edf4cf6cso3069799f8f.3 for ; Mon, 15 Sep 2025 04:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757936452; x=1758541252; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cZBtrYTmjnky2Xi391d5zrqPiMva7ofI4h9J6siEdNw=; b=YlGzuOcPnZYyCWugYt4EL6oS0oR9FPUkgmBjZSGR/ShLZy130XBReTef48BLMEQbdd R77LnJAncDp7nLkCGhH6PBqhyxb082t0axqbi6Y8YOb4NVLHva8groRizjH1Laq9Nhhh XWeFJMLdT8QOq4V8BdKhNssEEVQb9C3a51VZXKMruGfPI6XodN1Tc142nFKynBTXqXn6 iKFwF6a0+1Z8kmrRyla718MLrv9klTtxYm6uftsKS1HrOawha0G5WPK99ioOUrIPUyCW CY3zoiDEwXkYaGUXIafSxQXI8VGwDinjviE4VTSobmM0mjflvagPCG2rc3Tukd4reQN7 bgKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757936452; x=1758541252; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cZBtrYTmjnky2Xi391d5zrqPiMva7ofI4h9J6siEdNw=; b=u+4MBNrMItD33xNMC/f42KUv5D3Fl0INGpv5PLH3a6ACSv+d+KNC5GXKnf+nkOCfOJ s7jybNiF7rFoYkyqTjH815Ur+oph8rTazATteMw6XKkI6pgSkdC/0e0UqgW0QPyDa97Q kgzFYrDpTht8oPqL+ETMzKrbzUKBYe8bQFb750xdJNMlG1T6DZtXE43IULfhlCkStEiU I7xhL8XE8nQiZdtDGShrq78aWfgBYGFfye3Yu3LjfXWeOExRc3KtoY04g8q/2i3LpuRV Yj8Mb2OKstacEn6ErDeNWi0JbFCZRIZ7SjUBo+Gx+jnbdoihLjLA/hHZpZuE6ZGlftcH c7QQ== X-Forwarded-Encrypted: i=1; AJvYcCVvtgDavy9nFsY2ACKSdW/OkaIdBpeVgUXoZYmdhp32lzQQfxzIj8JsNtOrjcE6e6v6yDbsTCcbWYx5FaY=@vger.kernel.org X-Gm-Message-State: AOJu0YwbTqOHXHjk1Va/b9AycSwEJwC8ZwJlgy1nywa6Lu/Rs5OfIXgT Vt7J0wJXW9HgmAuvYBREbWe2BjHHfL7mqde//G4G5CjyST/F3FeP4JyI X-Gm-Gg: ASbGncuq74NG5ihOakX7QXzC4sJjD5zwQZWcnbE+IUdWlQ1ITu1duMVrBa1RnITRiDP a452FJDMKthFwPRfqWvd1qJC2hlYc/y8u+Di8Co1y0DjW/TJ4kbzQAnfvHdptECDK5Yi5/BOUO8 tMCBM7Gc8/2MJf62x4/v7jOevSUHFT5WpRCIgYU9W1UXh97I14RSccy0zpOBqlxY4z3qULkWPDk oSgTLYyJxKrQtzRJo3ehnGN3rarOq23fEvwWD3KvhJvR+ORK2ov0XMohDR9s6JyJDHIUCXYvLNJ u0CQo/APp70S5nU69rBKMY7pgWwH5RyD30TwM3hAbIzryLEDtDHQzxuZLJrPO6dHxg+kJlBQgyM W28nrEs1MMI6YVK5NxinyjVToA0wQrqCmgdkcO00cUFBX X-Google-Smtp-Source: AGHT+IEPBDET+aq7aWqMBXc4+ldGUX/PWl3peX+qrYQPG3n1Y29xuY+8jud+W1D227pp/+3seZYrkw== X-Received: by 2002:a05:6000:2013:b0:3eb:5e99:cbd3 with SMTP id ffacd0b85a97d-3eb5e99ce8cmr1458035f8f.2.1757936452358; Mon, 15 Sep 2025 04:40:52 -0700 (PDT) Received: from localhost ([45.10.155.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e0372bbd3sm172482185e9.10.2025.09.15.04.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Sep 2025 04:40:52 -0700 (PDT) From: Richard Gobert To: netdev@vger.kernel.org, pabeni@redhat.com, ecree.xilinx@gmail.com, willemdebruijn.kernel@gmail.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, horms@kernel.org, corbet@lwn.net, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, leon@kernel.org, dsahern@kernel.org, ncardwell@google.com, kuniyu@google.com, shuah@kernel.org, sdf@fomichev.me, aleksander.lobakin@intel.com, florian.fainelli@broadcom.com, alexander.duyck@gmail.com, linux-kernel@vger.kernel.org, linux-net-drivers@amd.com, Richard Gobert Subject: [PATCH net-next v5 2/5] net: gro: only merge packets with incrementing or fixed outer ids Date: Mon, 15 Sep 2025 13:39:30 +0200 Message-Id: <20250915113933.3293-3-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250915113933.3293-1-richardbgobert@gmail.com> References: <20250915113933.3293-1-richardbgobert@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Only merge encapsulated packets if their outer IDs are either incrementing or fixed, just like for inner IDs and IDs of non-encapsulated packets. Add another ip_fixedid bit for a total of two bits: one for outer IDs (and for unencapsulated packets) and one for inner IDs. This commit preserves the current behavior of GSO where only the IDs of the inner-most headers are restored correctly. Signed-off-by: Richard Gobert --- include/net/gro.h | 27 ++++++++++++--------------- net/ipv4/tcp_offload.c | 5 ++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index 87c68007f949..6aa563eec3d0 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -75,7 +75,7 @@ struct napi_gro_cb { u8 is_fou:1; =20 /* Used to determine if ipid_offset can be ignored */ - u8 ip_fixedid:1; + u8 ip_fixedid:2; =20 /* Number of gro_receive callbacks this packet already went through */ u8 recursion_counter:4; @@ -442,29 +442,26 @@ static inline __wsum ip6_gro_compute_pseudo(const str= uct sk_buff *skb, } =20 static inline int inet_gro_flush(const struct iphdr *iph, const struct iph= dr *iph2, - struct sk_buff *p, bool outer) + struct sk_buff *p, bool inner) { const u32 id =3D ntohl(*(__be32 *)&iph->id); const u32 id2 =3D ntohl(*(__be32 *)&iph2->id); const u16 ipid_offset =3D (id >> 16) - (id2 >> 16); const u16 count =3D NAPI_GRO_CB(p)->count; const u32 df =3D id & IP_DF; - int flush; =20 /* All fields must match except length and checksum. */ - flush =3D (iph->ttl ^ iph2->ttl) | (iph->tos ^ iph2->tos) | (df ^ (id2 & = IP_DF)); - - if (flush | (outer && df)) - return flush; + if ((iph->ttl ^ iph2->ttl) | (iph->tos ^ iph2->tos) | (df ^ (id2 & IP_DF)= )) + return true; =20 /* When we receive our second frame we can make a decision on if we * continue this flow as an atomic flow with a fixed ID or if we use * an incrementing ID. */ if (count =3D=3D 1 && df && !ipid_offset) - NAPI_GRO_CB(p)->ip_fixedid =3D true; + NAPI_GRO_CB(p)->ip_fixedid |=3D 1 << inner; =20 - return ipid_offset ^ (count * !NAPI_GRO_CB(p)->ip_fixedid); + return ipid_offset ^ (count * !(NAPI_GRO_CB(p)->ip_fixedid & (1 << inner)= )); } =20 static inline int ipv6_gro_flush(const struct ipv6hdr *iph, const struct i= pv6hdr *iph2) @@ -479,7 +476,7 @@ static inline int ipv6_gro_flush(const struct ipv6hdr *= iph, const struct ipv6hdr =20 static inline int __gro_receive_network_flush(const void *th, const void *= th2, struct sk_buff *p, const u16 diff, - bool outer) + bool inner) { const void *nh =3D th - diff; const void *nh2 =3D th2 - diff; @@ -487,19 +484,19 @@ static inline int __gro_receive_network_flush(const v= oid *th, const void *th2, if (((struct iphdr *)nh)->version =3D=3D 6) return ipv6_gro_flush(nh, nh2); else - return inet_gro_flush(nh, nh2, p, outer); + return inet_gro_flush(nh, nh2, p, inner); } =20 static inline int gro_receive_network_flush(const void *th, const void *th= 2, struct sk_buff *p) { - const bool encap_mark =3D NAPI_GRO_CB(p)->encap_mark; int off =3D skb_transport_offset(p); int flush; =20 - flush =3D __gro_receive_network_flush(th, th2, p, off - NAPI_GRO_CB(p)->n= etwork_offset, encap_mark); - if (encap_mark) - flush |=3D __gro_receive_network_flush(th, th2, p, off - NAPI_GRO_CB(p)-= >inner_network_offset, false); + flush =3D __gro_receive_network_flush(th, th2, p, off - NAPI_GRO_CB(p)->n= etwork_offset, false); + if (NAPI_GRO_CB(p)->encap_mark) { + flush |=3D __gro_receive_network_flush(th, th2, p, off - NAPI_GRO_CB(p)-= >inner_network_offset, true); + } =20 return flush; } diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index e6612bd84d09..1949eede9ec9 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -471,6 +471,7 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk= _buff *skb, int thoff) const u16 offset =3D NAPI_GRO_CB(skb)->network_offsets[skb->encapsulation= ]; const struct iphdr *iph =3D (struct iphdr *)(skb->data + offset); struct tcphdr *th =3D tcp_hdr(skb); + bool is_fixedid; =20 if (unlikely(NAPI_GRO_CB(skb)->is_flist)) { skb_shinfo(skb)->gso_type |=3D SKB_GSO_FRAGLIST | SKB_GSO_TCPV4; @@ -484,8 +485,10 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct s= k_buff *skb, int thoff) th->check =3D ~tcp_v4_check(skb->len - thoff, iph->saddr, iph->daddr, 0); =20 + is_fixedid =3D (NAPI_GRO_CB(skb)->ip_fixedid >> skb->encapsulation) & 1; + skb_shinfo(skb)->gso_type |=3D SKB_GSO_TCPV4 | - (NAPI_GRO_CB(skb)->ip_fixedid * SKB_GSO_TCP_FIXEDID); + (is_fixedid * SKB_GSO_TCP_FIXEDID); =20 tcp_gro_complete(skb); return 0; --=20 2.36.1