From nobody Thu Oct 2 03:27:36 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 E19AD31E893 for ; Tue, 23 Sep 2025 08:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617967; cv=none; b=mlc671E3jNDvpN3Aj76yIH0gS0mx7PLeX+o4NCRE50lLZTQs3vJBpJ0zW7j7TWQVSOvL+jJhiYQgy+P/Nu/RmVhUIBmqEHhsibfFUNecxTv3875s/3yBQU9DactfVxrLNVAPoBb7oHrqVehIgYnJ7vXCOQblBLLzRcDNn4utHq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617967; c=relaxed/simple; bh=5DFBuSdlxaCcOvy2y416jSTiEqL4AHa8+uh89xjhSCs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D3Zt0X6OBbBjWXuALg+PjOGUbJ4rr4aaSncXRovfRvoeeExN6fiOJV+HBBrNd+OWcQ+TPYZizRSXS/UBwAqJ3cLMwAF2dyuLiWXdK1xAb8sr9cHVP24hX7UTL/abbZP9OEzgbmK6gGKTDNql+Wk7ESrcuyi6qOyX59DyMguJY+Q= 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=SX1+kj0a; arc=none smtp.client-ip=209.85.128.54 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="SX1+kj0a" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-45e03730f83so22676105e9.0 for ; Tue, 23 Sep 2025 01:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758617964; x=1759222764; 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=nwLDNBiVN98UCDyIlQ/l+MZhscT3bhY9tzLzQhwCiT8=; b=SX1+kj0a5/O003ymovF85LFjAlWflBOG/Xv7MVTwPeZlAWJqXX6zKxqhe+HyHIFZWf TPDtmOHQ0qVWV1kWAWwyIziYAIauUqfPOPj+ym6LRRlb4tUW8WQcgQOUcVIIbv6ecSFW B3oweJXqSuxPrVkinF4dLe7YqHWXragOs5lUG1R33pt1UbFuL7XCGBdRlU7l7s72XAqb v5ojmDmbAqXuxB6TBCNoKhyUzekJxO/CB4AAE3phX2+TASVUxVYs5bmANWQ3ec2ljbU6 S/ZR2RJWmRkMueTTlkfp2GGtCbAd5S+m2gvQWkf7e+3HutSV/T0QZJe9IyUUgjA4nsYC e4bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758617964; x=1759222764; 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=nwLDNBiVN98UCDyIlQ/l+MZhscT3bhY9tzLzQhwCiT8=; b=hr//uCeyaCV8LlE8LVbE1uoNfvNFmDYPqlGYQRC5WSHaYH/Y3jtgl3Bvi683O1T1Vz fvjqnu5qjKdVgHiwFgTaB8XPmv6XdLl4KYyt4iXNtAy2qzPfI54BPImLyQKzBlZ6HxQN KU1hfwJVHlNULgTtDz57PVDovGwGt5KnpVcycsWS3lzF4NHoA8PAZa7rMtXI7fygBsXM 0XvQgxJ2iIlSltKd0LR7VRFxq/L5Jgp7AkK+fvIoQ758qgRM28ef6nPcltlSBV2zxwDW mSmCRALFZS0Ekn11PMPeoVkUdyCViH9AVTsLzopZJ/Mzq3EuceGOM0EzFLMWWznJzaRY 87fA== X-Forwarded-Encrypted: i=1; AJvYcCWEKhS1dPBjBcZvaOsNTTGz7mmjie4ai9U1NVMxsWqX8QX4FmjtNr6Aimj4dv9ZCMhdF+JR4lz4/EyXTkg=@vger.kernel.org X-Gm-Message-State: AOJu0YypffdO7KlH2WQyqjS+R388YwBHEm4OJ0jvi5NQv6quSKbCnOZz zoYK920ZM62xrJyBW28esrKv8RC6lMcSZ4dikhPbMHGDecYsdzm0Y2lY X-Gm-Gg: ASbGncsK9rIK51vM77cwRB6T33C4Mz+pyzZx0Op9qdOv9hWQ4PdvMI8NCmUC1dJqBGp 04lV/esyPLBoh4w73Rytupnch1FbTUEPtuhrynhcO+Mg29ygfMBLZIIJtMIVRf25DKL/9tXOXhH ARQDzV2d3kYPHyfsnmDBL2h2owumSs/zjLC9m0Yfx1b7nJRxLhKbfk0d/77Hoc3FHBKUUPXzG9c VkXYsuklBBIxb/Wpq1H3OQyloU3GNsEA2MwlAP9FRQPXCFe5YHy8YzU6xBnAHQI/N1hxeFjvrWv LuUTkpWjgNG4bHDb8DbDN1Op+DoIIglC94Y5k9dlMzo7mhRWQlNRIlnjcLznG1lv9U7mIpOCUsS hAl6oPloj9LI23HMVeinOXvc= X-Google-Smtp-Source: AGHT+IFawB3xsnjYPMJSU4q41gXyf3wTf24vfyWX18dtpwJgMnDI/Qr6U3C9d9ZpwJoYHvRq5cQY1w== X-Received: by 2002:a05:600c:a297:b0:46e:1f92:49ab with SMTP id 5b1f17b1804b1-46e1f924b99mr6075555e9.32.1758617964116; Tue, 23 Sep 2025 01:59:24 -0700 (PDT) Received: from localhost ([45.10.155.11]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e15d1610fsm51981555e9.7.2025.09.23.01.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 01:59:23 -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 , Willem de Bruijn Subject: [PATCH net-next v8 1/5] net: gro: remove is_ipv6 from napi_gro_cb Date: Tue, 23 Sep 2025 10:59:04 +0200 Message-Id: <20250923085908.4687-2-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250923085908.4687-1-richardbgobert@gmail.com> References: <20250923085908.4687-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" Remove is_ipv6 from napi_gro_cb and use sk->sk_family instead. This frees up space for another ip_fixedid bit that will be added in the next commit. udp_sock_create always creates either a AF_INET or a AF_INET6 socket, so using sk->sk_family is reliable. In IPv6-FOU, cfg->ipv6_v6only is always enabled. Signed-off-by: Richard Gobert Reviewed-by: Willem de Bruijn --- include/net/gro.h | 3 --- net/ipv4/fou_core.c | 32 ++++++++++++++------------------ net/ipv4/udp_offload.c | 2 -- net/ipv6/udp_offload.c | 2 -- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index a0fca7ac6e7e..87c68007f949 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -71,9 +71,6 @@ struct napi_gro_cb { /* Free the skb? */ u8 free:2; =20 - /* Used in foo-over-udp, set in udp[46]_gro_receive */ - u8 is_ipv6:1; - /* Used in GRE, set in fou/gue_gro_receive */ u8 is_fou:1; =20 diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c index 3e30745e2c09..3970b6b7ace5 100644 --- a/net/ipv4/fou_core.c +++ b/net/ipv4/fou_core.c @@ -228,21 +228,27 @@ static int gue_udp_recv(struct sock *sk, struct sk_bu= ff *skb) return 0; } =20 +static const struct net_offload *fou_gro_ops(const struct sock *sk, + int proto) +{ + const struct net_offload __rcu **offloads; + + /* FOU doesn't allow IPv4 on IPv6 sockets. */ + offloads =3D sk->sk_family =3D=3D AF_INET6 ? inet6_offloads : inet_offloa= ds; + return rcu_dereference(offloads[proto]); +} + static struct sk_buff *fou_gro_receive(struct sock *sk, struct list_head *head, struct sk_buff *skb) { - const struct net_offload __rcu **offloads; struct fou *fou =3D fou_from_sock(sk); const struct net_offload *ops; struct sk_buff *pp =3D NULL; - u8 proto; =20 if (!fou) goto out; =20 - proto =3D fou->protocol; - /* We can clear the encap_mark for FOU as we are essentially doing * one of two possible things. We are either adding an L4 tunnel * header to the outer L3 tunnel header, or we are simply @@ -254,8 +260,7 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, /* Flag this frame as already having an outer encap header */ NAPI_GRO_CB(skb)->is_fou =3D 1; =20 - offloads =3D NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; - ops =3D rcu_dereference(offloads[proto]); + ops =3D fou_gro_ops(sk, fou->protocol); if (!ops || !ops->callbacks.gro_receive) goto out; =20 @@ -268,10 +273,8 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, static int fou_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff) { - const struct net_offload __rcu **offloads; struct fou *fou =3D fou_from_sock(sk); const struct net_offload *ops; - u8 proto; int err; =20 if (!fou) { @@ -279,10 +282,7 @@ static int fou_gro_complete(struct sock *sk, struct sk= _buff *skb, goto out; } =20 - proto =3D fou->protocol; - - offloads =3D NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; - ops =3D rcu_dereference(offloads[proto]); + ops =3D fou_gro_ops(sk, fou->protocol); if (WARN_ON(!ops || !ops->callbacks.gro_complete)) { err =3D -ENOSYS; goto out; @@ -323,7 +323,6 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, struct list_head *head, struct sk_buff *skb) { - const struct net_offload __rcu **offloads; const struct net_offload *ops; struct sk_buff *pp =3D NULL; struct sk_buff *p; @@ -450,8 +449,7 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, /* Flag this frame as already having an outer encap header */ NAPI_GRO_CB(skb)->is_fou =3D 1; =20 - offloads =3D NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; - ops =3D rcu_dereference(offloads[proto]); + ops =3D fou_gro_ops(sk, proto); if (!ops || !ops->callbacks.gro_receive) goto out; =20 @@ -467,7 +465,6 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhof= f) { struct guehdr *guehdr =3D (struct guehdr *)(skb->data + nhoff); - const struct net_offload __rcu **offloads; const struct net_offload *ops; unsigned int guehlen =3D 0; u8 proto; @@ -494,8 +491,7 @@ static int gue_gro_complete(struct sock *sk, struct sk_= buff *skb, int nhoff) return err; } =20 - offloads =3D NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; - ops =3D rcu_dereference(offloads[proto]); + ops =3D fou_gro_ops(sk, proto); if (WARN_ON(!ops || !ops->callbacks.gro_complete)) goto out; =20 diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index b1f3fd302e9d..19d0b5b09ffa 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -891,8 +891,6 @@ struct sk_buff *udp4_gro_receive(struct list_head *head= , struct sk_buff *skb) skb_gro_checksum_try_convert(skb, IPPROTO_UDP, inet_gro_compute_pseudo); skip: - NAPI_GRO_CB(skb)->is_ipv6 =3D 0; - if (static_branch_unlikely(&udp_encap_needed_key)) sk =3D udp4_gro_lookup_skb(skb, uh->source, uh->dest); =20 diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index d8445ac1b2e4..046f13b1d77a 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -154,8 +154,6 @@ struct sk_buff *udp6_gro_receive(struct list_head *head= , struct sk_buff *skb) ip6_gro_compute_pseudo); =20 skip: - NAPI_GRO_CB(skb)->is_ipv6 =3D 1; - if (static_branch_unlikely(&udpv6_encap_needed_key)) sk =3D udp6_gro_lookup_skb(skb, uh->source, uh->dest); =20 --=20 2.36.1 From nobody Thu Oct 2 03:27:36 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 CF05431E0F2 for ; Tue, 23 Sep 2025 08:59:29 +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=1758617971; cv=none; b=I6InLvBe5P0KRrB6LZ9+jeVfBm4e3z1Ft0qJu6gm5N196lm4pfsB2EtXOPwej02U9aAzvBWA/Jg9Z2IFebDNCZYtKg0deFUcOIIMsGtAnT8YRMg5umEKofVR9WzxWhu9Bsd8MR24LUqDi4QS6V69H0CP+dBNPRJJ3ujacrc+7Is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617971; c=relaxed/simple; bh=4TByKul6egSJk+HaKyldDbHrnF64wZfAJH9KQXUP8mk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SnRIMYo1NV7G/TDtPu5z2Gjk7XtWuRwN8gBFfSdmDYFfB9VCX9YT/KoToRer8hpEcfwSv2m8SiiQu1V7gwAycZ3IC30FwGgu8o14vnHV1istCHhYmU1jMQ8x62w1VeFYvGqNOtOb5QkO2VEaIjH1AnVpHit3+Obyh57oUxsph+k= 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=BVd5AUfK; 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="BVd5AUfK" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so2707717f8f.3 for ; Tue, 23 Sep 2025 01:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758617968; x=1759222768; 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=PMBCEfnu+kmymytri3ZOW4zfHFjEkdcPm1fze6NbWnw=; b=BVd5AUfKJRjtDti8vvslh16JowuJ7AnqhpCpMYhl3XJR4b8iDlCNv7RsmGOe3f4CF+ hvpbfDTVqYFMa3WGxkbYMSOQj+qzhbSnjfLdzni+nRq+GThuGO3wM79Tp0vhTogVQpmh k63urCQQ32xsE+p/f3BfuVKa80tzo2XJPLLaMXbEYSJs4/gA6o9HhHA2VFyOO788u/Xo JTKHxCuqoh0i9pzoEN9s/CMYeqHyK8MWlre9tbkNYUe0iwtvrFodefLA8UCtvp+7f5mu cKDz9a224RO2FquQV3X/q10NpvXfU3544DByD/0KTUrbaSDTN4+jYsEIHjtfLJWi++bx porw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758617968; x=1759222768; 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=PMBCEfnu+kmymytri3ZOW4zfHFjEkdcPm1fze6NbWnw=; b=bTPrbAEB21+NwnBeUXs08E1wWBPUledHD2uHpz+F2FSanHNl2tlTzEG/u0AJ7XZsq7 Zgc+oO7MXvEw0XRTNfdwR7A0zrA0pPDVoZJZMTns0DltcdslJo8mhO1J19eSyDGPBhwi JBgxo9nvToCUN9xfiriLaEX4D8XlMYjwjRONlF8pnYHYmbqsCsCMHY6ZseYTjjLi8hiZ eKEs9HIvijPGetYwRBPEI2vIr0exKVs7xVI2iVwXhD3u++XOdfK3HLF8LgKlmgQz9ihK SL45IemJU6bI6CYm1aRIu8x3ultDqGDJTE638j1DSiqhZFPiKZ/ZIZPkqveFLBuoMMQ7 NgCw== X-Forwarded-Encrypted: i=1; AJvYcCUYUb74AX49SR6ERm2BpqMQFOgU+OGBbzL4Szd3iWK5JPllZ9M5oxsMP6bZc5Z3AkTL5Xy0mriADR2Yssc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywu/nYoOlxEztp66v0qbuq/LPkcbBH9pA9mL3lq+VJ+k+hjHkqy FWNZXokM+9V7D1fUckocobHsvM8IJ0p1V9nwQGOuHxCGU15xxGxW6NCV X-Gm-Gg: ASbGncuhj5407hfDbh51y8uOkRKtQBkNZKSYCQjdqg1NSTBas93yYbZxMyvj4HgCbGA 63SKiqJwloWS67ckLCw9NsdKaodmUIHg/5w1IsADq1y9FGWtriO5sA5RjlY+RKmtYNKiMHrScTs J+6ai3nxRuXh7kZHvv5/QgBAZuoYGpySBDyJixXzkYU2V8TKCxBmXVf3glylTaN4P+mW/18fnTh /NDTwZFn003ATCly6w37AuqFuorH0Iwc3RQaFjeIIYAaa6oDcAhVoLyW9WEqZZXU3lOCdO9bENr CJgf7S/+JPOQ5dF10Ml/CqLp/sTXTu3Rt3gUFjNEuDTgMnmk6rafSsaUXo6uNPloOX77TMn/kLd o8ZTCSHEa2FKL/WcZPUXlyFM= X-Google-Smtp-Source: AGHT+IGOqHyX4WKDfvB1rmoMNtxtsxlSY9mdxEHxCQRn3i1HhC5BqsYZLOZG2J1bOy+2bSjoZ9fRlg== X-Received: by 2002:a5d:64e8:0:b0:3eb:4681:acbc with SMTP id ffacd0b85a97d-405c523c244mr1529592f8f.23.1758617967928; Tue, 23 Sep 2025 01:59:27 -0700 (PDT) Received: from localhost ([45.10.155.11]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3ee0fbfedd6sm23531696f8f.60.2025.09.23.01.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 01:59:27 -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 , Willem de Bruijn Subject: [PATCH net-next v8 2/5] net: gro: only merge packets with incrementing or fixed outer ids Date: Tue, 23 Sep 2025 10:59:05 +0200 Message-Id: <20250923085908.4687-3-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250923085908.4687-1-richardbgobert@gmail.com> References: <20250923085908.4687-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 Reviewed-by: Willem de Bruijn --- include/net/gro.h | 26 +++++++++++--------------- net/ipv4/tcp_offload.c | 5 ++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index 87c68007f949..e7997a9fb30b 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,18 @@ 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 From nobody Thu Oct 2 03:27:36 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 384FB3203BC for ; Tue, 23 Sep 2025 08:59:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617976; cv=none; b=WuM8qN2W5IuTA976s7OuYqNqezLrcpnz5XXkvZTuqlPK4IBDAUmK7PpMfiq2ckrOE8qZTYAW+NFSBJxnSNLUVKJJyvDP8jO/+JeZEz1CM80g5VfeqspArO1YbL6eCvBaj7iLgI/tY7MO4vxDAjELmQY4lsH+9+7Z+D/egiZ/cb0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617976; c=relaxed/simple; bh=mwpH+4zT1g+G6TEU7adv0o3lnrk9wxcULLWWDCh5YeQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N+ywYyK4Hyr4nzmwkRN7jguBPgtQ9VJV+BjmB1Xw1v3OKvzEqbYKZmhn9GElGPzlP3Kta1O/3xGrJBPcSwWGu8efXdGORS7Q8qW1UBZF6arz7d9lhDUdL5Yk6e3D6B+F631kzUHMpG3FDADud5cTZGHSyalsb7Z5sP2HqQRPHd8= 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=UZD/XVrj; arc=none smtp.client-ip=209.85.221.51 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="UZD/XVrj" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3f1aff41e7eso4282601f8f.0 for ; Tue, 23 Sep 2025 01:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758617972; x=1759222772; 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=OYiWSiIlw6279hv0NQoxwvuf0HzKxI1tMKOKA6xTFU8=; b=UZD/XVrj+M/AwItpf46z5iup56xPPjyoTu374bYix3ApnSKq+we5DJBiLfIZJcl/s9 Xw8KBiVLhEl5SBq3FgPE8X5a/dRVztJ0hjzb+BGbTs7ioFNztlomc5u00l53o7c2Gdjv 7NuNZqYIqNQt6XcLwF4W2YvBaIlWNjYATCUyChX1R3TukczdUIrV9kdOaPkQDXFjgCyh KFVOY8PLu/euIpaR4jJd1sdtIifVF6MxyreZ8cZf1DlGaDxFBfQnKz1jU/wlQj+DMmYm JvjoWxo/i9qoIWlKjbjN4vi5gm/ZP90Y4YNZYllOHdlUJ6HUj0h1GtfubQbnij7ATHyY Czmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758617972; x=1759222772; 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=OYiWSiIlw6279hv0NQoxwvuf0HzKxI1tMKOKA6xTFU8=; b=f7pFw/4aBu5S5oXDm0q0uvMc4NVLV7O2kNGdMgiBfGE5XQstfWPO/o+vZzhB2IFbOl LW1zpCrURAqnCKubHWBR9eR9xCPd3NVICHvSmor+YQTaoweA32n45y3QHDwacq49qIsx Z1VGt7jjpCFJtcgSPck+TDJaSCQNkMTyBWcaMfCbIQISJ3TGPttp4H4eCTSHuc0dVB/S K4akLBHUE+lAvg1MfjK6tScUUAYdDHSHIQnjZAfML51uGcv4GtBMyCGNsW767JScNLfz Q2vr6JwRW3rt4cHfZ5b4QtKMWzehKWhujWPBVfDlGhMIrrdkaPr0bJUpYUK4oVZ2e8ZK cKNA== X-Forwarded-Encrypted: i=1; AJvYcCX2WNb0qkAjaT8sHBiwoUddaljW+AKKWKcIwplSpXR0enkhfdeQXD1LhXadtf9+MRCxmLKHbdau+BfzppM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9NLZKk5tpZmASbrhZKRnFesSVpUOOkN3ZEdwjibXHVGaA1Ce+ FZG9A9uvTU/kgtKTOp37tceG2WEgJT6nR0Szjp8XuIEt/9MEo/fBaRdY X-Gm-Gg: ASbGncsk4JUuFRZ0s9aUvWANHguTzoxNfWHEh26hNNkkor7eaTAcP6CaXLLx5157zJK hvGQErA23oq5oShKjiI2zuIagH1+3fPNpCPXPQez0Dzmc114YuLhFgIqBsqYMUdbscQLiBleHs7 QT4Yf6uvgwh3SNX5ryUNBgH3/UZnKx32N7CPrxWusn5sbv2C90u1KHP2pDXCSBPCD7zhBRaR7CU K8Nda7MTJp92WwCqDgfjkQwWLSXy36ZtrrDo/pBae/mEfqpWoZlbjL42pp2sIT7Gu1ORd3MjNIC 77m3vzHIQy45d8Gu/WcD508XZuIto4jz26jiP/T+5oB7pYUix94Iezay1lF1DfZ31UDh3mBIEWu vQcRSERob3MCMM3ccexBai50= X-Google-Smtp-Source: AGHT+IGClJdJiVhI5jJZUAbVwrS1FBA8/oKDSDW4t0gzkJprCRTYzuYqCR9Df0AIVJ3AbEfUDArkWw== X-Received: by 2002:a5d:5f92:0:b0:3eb:5e99:cbb9 with SMTP id ffacd0b85a97d-405c5bd7687mr1648976f8f.10.1758617972340; Tue, 23 Sep 2025 01:59:32 -0700 (PDT) Received: from localhost ([45.10.155.11]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46d7a566a27sm67571115e9.20.2025.09.23.01.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 01:59:32 -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 v8 3/5] net: gso: restore ids of outer ip headers correctly Date: Tue, 23 Sep 2025 10:59:06 +0200 Message-Id: <20250923085908.4687-4-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250923085908.4687-1-richardbgobert@gmail.com> References: <20250923085908.4687-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" Currently, NETIF_F_TSO_MANGLEID indicates that the inner-most ID can be mangled. Outer IDs can always be mangled. Make GSO preserve outer IDs by default, with NETIF_F_TSO_MANGLEID allowing both inner and outer IDs to be mangled. This commit also modifies a few drivers that use SKB_GSO_FIXEDID directly. Signed-off-by: Richard Gobert Reviewed-by: Edward Cree # for sfc --- .../networking/segmentation-offloads.rst | 22 ++++++++++++------- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +++++-- drivers/net/ethernet/sfc/ef100_tx.c | 17 ++++++++++---- include/linux/netdevice.h | 9 ++++++-- include/linux/skbuff.h | 8 ++++++- net/core/dev.c | 10 +++++++-- net/ipv4/af_inet.c | 13 +++++------ net/ipv4/tcp_offload.c | 6 ++--- 8 files changed, 63 insertions(+), 30 deletions(-) diff --git a/Documentation/networking/segmentation-offloads.rst b/Documenta= tion/networking/segmentation-offloads.rst index 085e8fab03fd..72f69b22b28c 100644 --- a/Documentation/networking/segmentation-offloads.rst +++ b/Documentation/networking/segmentation-offloads.rst @@ -43,10 +43,19 @@ also point to the TCP header of the packet. For IPv4 segmentation we support one of two types in terms of the IP ID. The default behavior is to increment the IP ID with every segment. If the GSO type SKB_GSO_TCP_FIXEDID is specified then we will not increment the IP -ID and all segments will use the same IP ID. If a device has -NETIF_F_TSO_MANGLEID set then the IP ID can be ignored when performing TSO -and we will either increment the IP ID for all frames, or leave it at a -static value based on driver preference. +ID and all segments will use the same IP ID. + +For encapsulated packets, SKB_GSO_TCP_FIXEDID refers only to the outer hea= der. +SKB_GSO_TCP_FIXEDID_INNER can be used to specify the same for the inner he= ader. +Any combination of these two GSO types is allowed. + +If a device has NETIF_F_TSO_MANGLEID set then the IP ID can be ignored when +performing TSO and we will either increment the IP ID for all frames, or l= eave +it at a static value based on driver preference. For encapsulated packets, +NETIF_F_TSO_MANGLEID is relevant for both outer and inner headers, unless = the +DF bit is not set on the outer header, in which case the device driver must +guarantee that the IP ID field is incremented in the outer header with eve= ry +segment. =20 =20 UDP Fragmentation Offload @@ -124,10 +133,7 @@ Generic Receive Offload Generic receive offload is the complement to GSO. Ideally any frame assembled by GRO should be segmented to create an identical sequence of frames using GSO, and any sequence of frames segmented by GSO should be -able to be reassembled back to the original by GRO. The only exception to -this is IPv4 ID in the case that the DF bit is set for a given IP header. -If the value of the IPv4 ID is not sequentially incrementing it will be -altered so that it is when a frame assembled via GRO is segmented via GSO. +able to be reassembled back to the original by GRO. =20 =20 Partial Generic Segmentation Offload diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_rx.c index b8c609d91d11..480f66e21132 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -1289,8 +1289,12 @@ static void mlx5e_shampo_update_ipv4_tcp_hdr(struct = mlx5e_rq *rq, struct iphdr * tcp->check =3D ~tcp_v4_check(skb->len - tcp_off, ipv4->saddr, ipv4->daddr, 0); skb_shinfo(skb)->gso_type |=3D SKB_GSO_TCPV4; - if (ntohs(ipv4->id) =3D=3D rq->hw_gro_data->second_ip_id) - skb_shinfo(skb)->gso_type |=3D SKB_GSO_TCP_FIXEDID; + if (ntohs(ipv4->id) =3D=3D rq->hw_gro_data->second_ip_id) { + bool encap =3D rq->hw_gro_data->fk.control.flags & FLOW_DIS_ENCAPSULATIO= N; + + skb_shinfo(skb)->gso_type |=3D encap ? SKB_GSO_TCP_FIXEDID_INNER : + SKB_GSO_TCP_FIXEDID; + } =20 skb->csum_start =3D (unsigned char *)tcp - skb->head; skb->csum_offset =3D offsetof(struct tcphdr, check); diff --git a/drivers/net/ethernet/sfc/ef100_tx.c b/drivers/net/ethernet/sfc= /ef100_tx.c index e6b6be549581..03005757c060 100644 --- a/drivers/net/ethernet/sfc/ef100_tx.c +++ b/drivers/net/ethernet/sfc/ef100_tx.c @@ -189,6 +189,7 @@ static void ef100_make_tso_desc(struct efx_nic *efx, { bool gso_partial =3D skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL; unsigned int len, ip_offset, tcp_offset, payload_segs; + u32 mangleid_outer =3D ESE_GZ_TX_DESC_IP4_ID_INC_MOD16; u32 mangleid =3D ESE_GZ_TX_DESC_IP4_ID_INC_MOD16; unsigned int outer_ip_offset, outer_l4_offset; u16 vlan_tci =3D skb_vlan_tag_get(skb); @@ -200,8 +201,17 @@ static void ef100_make_tso_desc(struct efx_nic *efx, bool outer_csum; u32 paylen; =20 - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID) - mangleid =3D ESE_GZ_TX_DESC_IP4_ID_NO_OP; + if (encap) { + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID_INNER) + mangleid =3D ESE_GZ_TX_DESC_IP4_ID_NO_OP; + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID) + mangleid_outer =3D ESE_GZ_TX_DESC_IP4_ID_NO_OP; + } else { + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID) + mangleid =3D ESE_GZ_TX_DESC_IP4_ID_NO_OP; + mangleid_outer =3D ESE_GZ_TX_DESC_IP4_ID_NO_OP; + } + if (efx->net_dev->features & NETIF_F_HW_VLAN_CTAG_TX) vlan_enable =3D skb_vlan_tag_present(skb); =20 @@ -245,8 +255,7 @@ static void ef100_make_tso_desc(struct efx_nic *efx, ESF_GZ_TX_TSO_OUTER_L4_OFF_W, outer_l4_offset >> 1, ESF_GZ_TX_TSO_ED_OUTER_UDP_LEN, udp_encap && !gso_partial, ESF_GZ_TX_TSO_ED_OUTER_IP_LEN, encap && !gso_partial, - ESF_GZ_TX_TSO_ED_OUTER_IP4_ID, encap ? mangleid : - ESE_GZ_TX_DESC_IP4_ID_NO_OP, + ESF_GZ_TX_TSO_ED_OUTER_IP4_ID, mangleid_outer, ESF_GZ_TX_TSO_VLAN_INSERT_EN, vlan_enable, ESF_GZ_TX_TSO_VLAN_INSERT_TCI, vlan_tci ); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f3a3b761abfb..3d19c888b839 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -5290,13 +5290,18 @@ void skb_warn_bad_offload(const struct sk_buff *skb= ); =20 static inline bool net_gso_ok(netdev_features_t features, int gso_type) { - netdev_features_t feature =3D (netdev_features_t)gso_type << NETIF_F_GSO_= SHIFT; + netdev_features_t feature; + + if (gso_type & (SKB_GSO_TCP_FIXEDID | SKB_GSO_TCP_FIXEDID_INNER)) + gso_type |=3D __SKB_GSO_TCP_FIXEDID; + + feature =3D ((netdev_features_t)gso_type << NETIF_F_GSO_SHIFT) & NETIF_F_= GSO_MASK; =20 /* check flags correspondence */ BUILD_BUG_ON(SKB_GSO_TCPV4 !=3D (NETIF_F_TSO >> NETIF_F_GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_DODGY !=3D (NETIF_F_GSO_ROBUST >> NETIF_F_GSO_SHIF= T)); BUILD_BUG_ON(SKB_GSO_TCP_ECN !=3D (NETIF_F_TSO_ECN >> NETIF_F_GSO_SHIFT)); - BUILD_BUG_ON(SKB_GSO_TCP_FIXEDID !=3D (NETIF_F_TSO_MANGLEID >> NETIF_F_GS= O_SHIFT)); + BUILD_BUG_ON(__SKB_GSO_TCP_FIXEDID !=3D (NETIF_F_TSO_MANGLEID >> NETIF_F_= GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_TCPV6 !=3D (NETIF_F_TSO6 >> NETIF_F_GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_FCOE !=3D (NETIF_F_FSO >> NETIF_F_GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_GRE !=3D (NETIF_F_GSO_GRE >> NETIF_F_GSO_SHIFT)); diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ca8be45dd8be..646fb66ba948 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -674,7 +674,7 @@ enum { /* This indicates the tcp segment has CWR set. */ SKB_GSO_TCP_ECN =3D 1 << 2, =20 - SKB_GSO_TCP_FIXEDID =3D 1 << 3, + __SKB_GSO_TCP_FIXEDID =3D 1 << 3, =20 SKB_GSO_TCPV6 =3D 1 << 4, =20 @@ -707,6 +707,12 @@ enum { SKB_GSO_FRAGLIST =3D 1 << 18, =20 SKB_GSO_TCP_ACCECN =3D 1 << 19, + + /* These indirectly map onto the same netdev feature. + * If NETIF_F_TSO_MANGLEID is set it may mangle both inner and outer IDs. + */ + SKB_GSO_TCP_FIXEDID =3D 1 << 30, + SKB_GSO_TCP_FIXEDID_INNER =3D 1 << 31, }; =20 #if BITS_PER_LONG > 32 diff --git a/net/core/dev.c b/net/core/dev.c index 93a25d87b86b..3b5cba01a611 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3768,8 +3768,14 @@ static netdev_features_t gso_features_check(const st= ruct sk_buff *skb, if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL)) features &=3D ~dev->gso_partial_features; =20 - /* Make sure to clear the IPv4 ID mangling feature if the - * IPv4 header has the potential to be fragmented. + /* Make sure to clear the IPv4 ID mangling feature if the IPv4 header + * has the potential to be fragmented so that TSO does not generate + * segments with the same ID. For encapsulated packets, the ID mangling + * feature is guaranteed not to use the same ID for the outer IPv4 + * headers of the generated segments if the headers have the potential + * to be fragmented, so there is no need to clear the IPv4 ID mangling + * feature (see the section about NETIF_F_TSO_MANGLEID in + * segmentation-offloads.rst). */ if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) { struct iphdr *iph =3D skb->encapsulation ? diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 76e38092cd8a..fc7a6955fa0a 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1393,14 +1393,13 @@ struct sk_buff *inet_gso_segment(struct sk_buff *sk= b, =20 segs =3D ERR_PTR(-EPROTONOSUPPORT); =20 - if (!skb->encapsulation || encap) { - udpfrag =3D !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP); - fixedid =3D !!(skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID); + /* fixed ID is invalid if DF bit is not set */ + fixedid =3D !!(skb_shinfo(skb)->gso_type & (SKB_GSO_TCP_FIXEDID << encap)= ); + if (fixedid && !(ip_hdr(skb)->frag_off & htons(IP_DF))) + goto out; =20 - /* fixed ID is invalid if DF bit is not set */ - if (fixedid && !(ip_hdr(skb)->frag_off & htons(IP_DF))) - goto out; - } + if (!skb->encapsulation || encap) + udpfrag =3D !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP); =20 ops =3D rcu_dereference(inet_offloads[proto]); if (likely(ops && ops->callbacks.gso_segment)) { diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index 1949eede9ec9..2cb93da93abc 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -471,7 +471,6 @@ 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; @@ -485,10 +484,9 @@ 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; - + BUILD_BUG_ON(SKB_GSO_TCP_FIXEDID << 1 !=3D SKB_GSO_TCP_FIXEDID_INNER); skb_shinfo(skb)->gso_type |=3D SKB_GSO_TCPV4 | - (is_fixedid * SKB_GSO_TCP_FIXEDID); + (NAPI_GRO_CB(skb)->ip_fixedid * SKB_GSO_TCP_FIXEDID); =20 tcp_gro_complete(skb); return 0; --=20 2.36.1 From nobody Thu Oct 2 03:27:36 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 6A580320A20 for ; Tue, 23 Sep 2025 08:59:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617981; cv=none; b=MuWrTxNUoRZR9B22/7nj6WzWmS50766esFYyXUWkkqidhQ16wyfTDXIzP1AY5+pa9I5nGFMsIjuqj2i36fEX6ue43NtKdJMU1ixQw97YgqrW1u3oQgZGtSEK755ELSLfXV/ZiQpyzbP4n5N6KSWMcQ3qSJziGyE7Wd5ieQq4K5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617981; c=relaxed/simple; bh=kVgoHwy6jjvf1QemDdlf3DDsHECl0hJXuFQxcVH0zxs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NqV1iFgfolmMyJrQCklRELftpKj6HGjvk0ONF08RNPXrOuTnJh4tmlemx8KW+68bKvCojnrcyr6+DphVvNyvge7WRZxrmyUAiJVnb7ZWU6tFrIEEFYhodeSy4CryveZVdqEfuu2dB+WEULREhZqxRYa3tvpn1+vreHdoQsJIkd8= 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=QEjmNjYg; arc=none smtp.client-ip=209.85.221.52 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="QEjmNjYg" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3ee13baf2e1so3835359f8f.3 for ; Tue, 23 Sep 2025 01:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758617978; x=1759222778; 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=nnPlx3AD0qlRydPbaBxHLAGb56Xx3APcL+18Eue+CQ4=; b=QEjmNjYgZpMUJJVkPRa0PTivTSOsZsjk7yrQtzhIExlQgjDrKJtQzyqk8D0mZbzEle X2ZVp/NpKW5t/jkXtrkZGYXvREVEUZaiOzNvhYs4qq2v12+s/DXoXCYisEor7s5k09Jv GOp/toQVBpkeo1f+4RXVxy7a2KER8g+iQM0Vb2b1yxQ6HEjl0Ejt0uTpESvtvZBM2+7Y qzkxgpDbYd5DkJwNUf4jg/eC2bdlD2BdecBgA/QJa2FjY0k6CjcdNtquTqKqKz/FQ6SZ NG4c1xNrkxcGYhryM6UHg9kRUL0kgV4oNURuMcyLh/xSZjXYVPNDuQRolDRCgrRniV/I H+QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758617978; x=1759222778; 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=nnPlx3AD0qlRydPbaBxHLAGb56Xx3APcL+18Eue+CQ4=; b=eZzZ+WOqX6EmEtb/q5EvT+AQw39yPkKuMC8yUVc4sm0D6363R/8BOO/G6qb54y9yhR 3nhmXtf9vPEqaad6M5es0sHHGIEYHODova6IAonHFx1OtJQMM06icum4QeeCVseBA5OT F2SP/Lu8Grp8b1h2oo2ktgyGxf40OOSf6MBiBmXP4gHgCWsqC7pYF7ZkbqbmqmlY9k3V 6NGKDm7uzddZUGD3w8OmkcgBWlXoD2Emus3IgHPJmR7SVMMB7RYPshFW9ZnQNohFFbHZ CLaFb8YvD7h4qlHq3uwLHeq6hryHsNnYUs45VQG88cTjqCcvaloVc0m3GSWcamRwQFo3 tUKQ== X-Forwarded-Encrypted: i=1; AJvYcCVDl0xgWa+NzDvIuqwxMBJ0bWjeiiz6Yjkq6ejnIlc0OH+w2ATFMoPe5PTSi6Z/5Kt6VhkEbJXzMGUhVaQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwZSUzlIuWLWxNRRxeYDnwG8jg/Iu0diph6YIl1/Z+b48sx8mSS Sl5z4fgpZ60jdGpHAwGMy1RQnV1fDtcbhleU1RbQlDpIXo/0yJDEolcf X-Gm-Gg: ASbGncvLFUk6W9Yz7JySzOUdlg3JHHfZmZCWK7O8ZddQqk3b2MTrOn3tsC+r3ytQip3 gEuHiB30GS0+u8DbE4xeo5ZDeYFnnlFKpaO5bDWHyeOgsolR9dw1VqWMl7uUI0XI7ID9lU9FVSc vEtN3LOfJ4qx+99w4N8Udw5JEelxsM1sCRPW7Jg1740nWwIKxzG48v1mEP90Gjy9hdnWwacMygy lqhP3I9SPN7InJZqaBH+I4oDNMLKJnsnXMewSbjK6ySKOOlXYoi//79nbkzeWsJIs+KaquLFE26 xZPamafuuO/I38axpkhQViOLWWvZWbPi+tVcmXTusxogLoT6tBBq0+jYvi8M6yGM7aJW5AbAPzP UgsWo4eDphcz0CEeDwBjqC+M= X-Google-Smtp-Source: AGHT+IG4eLaa4z203/TpewOpCHeAuWlt+0sMbe6X6EHPpFByd90iWgb55eTmaNSVhvkP3W4qnUin9A== X-Received: by 2002:a05:6000:1866:b0:3ec:db87:e8a7 with SMTP id ffacd0b85a97d-405cb3e5d50mr1091344f8f.61.1758617977677; Tue, 23 Sep 2025 01:59:37 -0700 (PDT) Received: from localhost ([45.10.155.11]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3f829e01a15sm11649545f8f.57.2025.09.23.01.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 01:59:37 -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 , Willem de Bruijn Subject: [PATCH net-next v8 4/5] net: gro: remove unnecessary df checks Date: Tue, 23 Sep 2025 10:59:07 +0200 Message-Id: <20250923085908.4687-5-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250923085908.4687-1-richardbgobert@gmail.com> References: <20250923085908.4687-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" Currently, packets with fixed IDs will be merged only if their don't-fragment bit is set. This restriction is unnecessary since packets without the don't-fragment bit will be forwarded as-is even if they were merged together. The merged packets will be segmented into their original forms before being forwarded, either by GSO or by TSO. The IDs will also remain identical unless NETIF_F_TSO_MANGLEID is set, in which case the IDs can become incrementing, which is also fine. Clean up the code by removing the unnecessary don't-fragment checks. Signed-off-by: Richard Gobert Reviewed-by: Willem de Bruijn --- include/net/gro.h | 5 ++--- net/ipv4/af_inet.c | 3 --- tools/testing/selftests/net/gro.c | 9 ++++----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index e7997a9fb30b..e3affb2e2ca8 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -448,17 +448,16 @@ static inline int inet_gro_flush(const struct iphdr *= iph, const struct iphdr *ip 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; =20 /* All fields must match except length and checksum. */ - if ((iph->ttl ^ iph2->ttl) | (iph->tos ^ iph2->tos) | (df ^ (id2 & IP_DF)= )) + if ((iph->ttl ^ iph2->ttl) | (iph->tos ^ iph2->tos) | ((id ^ 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) + if (count =3D=3D 1 && !ipid_offset) NAPI_GRO_CB(p)->ip_fixedid |=3D 1 << inner; =20 return ipid_offset ^ (count * !(NAPI_GRO_CB(p)->ip_fixedid & (1 << inner)= )); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index fc7a6955fa0a..c0542d9187e2 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1393,10 +1393,7 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb, =20 segs =3D ERR_PTR(-EPROTONOSUPPORT); =20 - /* fixed ID is invalid if DF bit is not set */ fixedid =3D !!(skb_shinfo(skb)->gso_type & (SKB_GSO_TCP_FIXEDID << encap)= ); - if (fixedid && !(ip_hdr(skb)->frag_off & htons(IP_DF))) - goto out; =20 if (!skb->encapsulation || encap) udpfrag =3D !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP); diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/ne= t/gro.c index d5824eadea10..3d4a82a2607c 100644 --- a/tools/testing/selftests/net/gro.c +++ b/tools/testing/selftests/net/gro.c @@ -670,7 +670,7 @@ static void send_flush_id_case(int fd, struct sockaddr_= ll *daddr, int tcase) iph2->id =3D htons(9); break; =20 - case 3: /* DF=3D0, Fixed - should not coalesce */ + case 3: /* DF=3D0, Fixed - should coalesce */ iph1->frag_off &=3D ~htons(IP_DF); iph1->id =3D htons(8); =20 @@ -1188,10 +1188,9 @@ static void gro_receiver(void) correct_payload[0] =3D PAYLOAD_LEN * 2; check_recv_pkts(rxfd, correct_payload, 1); =20 - printf("DF=3D0, Fixed - should not coalesce: "); - correct_payload[0] =3D PAYLOAD_LEN; - correct_payload[1] =3D PAYLOAD_LEN; - check_recv_pkts(rxfd, correct_payload, 2); + printf("DF=3D0, Fixed - should coalesce: "); + correct_payload[0] =3D PAYLOAD_LEN * 2; + check_recv_pkts(rxfd, correct_payload, 1); =20 printf("DF=3D1, 2 Incrementing and one fixed - should coalesce only fir= st 2 packets: "); correct_payload[0] =3D PAYLOAD_LEN * 2; --=20 2.36.1 From nobody Thu Oct 2 03:27:36 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.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 9950831FEC3 for ; Tue, 23 Sep 2025 08:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617985; cv=none; b=DFTZ4t9i5HxECHSWw8NATOsnNXtgUCXoO0as067kP+6HH/y6T3XmHNOxzbg6uaO8LMKbA5JL/3ctq/B+u71wL0mkdwzP1lVEYduEEkX5kaZj/OIhp3X3zqh/+qEkqeAgWymy6L5luIDQgcq7FFSRp4twINRqk7ymNxF5XVPy4bw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758617985; c=relaxed/simple; bh=8UM+az2cWYByr8ObEhssbPumaYByLl4dcAU6DqAxNeo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uDUIClmjFA7EFGwpjN10gRjVhdSwPR3CPSEM7LmPj7SDMaIuv13gzUbypzvGClvkLBLZL8Y3ofaHUyigCoKY+uR5Dn9+/v4dAPWeHPpbRUKtAmquhuMJfCw0d+7t3VzCo2vKFjP0wSQhYHWO+sr1RmJolChKRKJLK/SGxvrYJPs= 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=d5USuWAf; arc=none smtp.client-ip=209.85.128.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="d5USuWAf" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-45e03730f83so22677575e9.0 for ; Tue, 23 Sep 2025 01:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758617982; x=1759222782; 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=mRVOBg/z8tQ2d5GGqKN0EIKc3OKKueO2kHvL3hZOMP8=; b=d5USuWAfjMy+iK8h7hyOlDcsEF3wDXXoeFt8TdOsOlMgCd5RzsMPhks+ifePz3pfmf egzSwYdrgkrjrpxgnKvunPy0eckfeioz3CTrCy3FHWm7Zs2EUjnG9qvQsFg8GEhJjY2+ 6UOUZQoExhlDYeGx+sTJQROUvIODjtOysjjR3uqIcsKtXVWilpQ2xDDnzl710A8VwmNV kM/YqAloiIu+I2aigQf7etcG9b9azitbG7F9/ewQItSq9o8Pl/r7jhAR5q5+2SBNL3Kt KIaAEQ1pt4XmCfcsoMntcjPONjkaGYM99uWsaSK/rzzl1N/6lQfdufsbqj8PIKVHXI+f 7Izw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758617982; x=1759222782; 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=mRVOBg/z8tQ2d5GGqKN0EIKc3OKKueO2kHvL3hZOMP8=; b=W7Gb+YJdBGLvz+21tSSORCXnC++UhyX8F9y/9tSdg7iXX57vGt44telrYyDzxHSmZp GRBD8B7OfNTwJXF8kaq/oT0ckEzZtZZWZsUYHsnK7FWPdEdaOTeAsthv5CbqVkX3zKOL HyJ36aXacYAwr5zl5Je5F6avKpPi+1o+MQzGmU0qYybMWRygJTtRdu1BYX78Tj1AM5e/ FsRQhXcvic4gEnMpOGCeHyoTFhwTKkoDFybjUqo7C3jC0ShseAvtKJObF1amlXl/wP92 JdfSzKoeExpjPNXSOORyTAqusAMkiBpe3HLeTviP3EVxBcIRzBy6exqIyAKzQW1lCP4e TupQ== X-Forwarded-Encrypted: i=1; AJvYcCWZF7pAc3d7ibAIqgLkCtCiXimQnZr/Wx8U7yCcUrTM/wxQeeSrusytzpU0pJSd9Dz/bGt4iVm2JjZalOE=@vger.kernel.org X-Gm-Message-State: AOJu0YyadujDCnm41JKwlG0hdzhxjrYN2XjCrxjumfF5YRli+uChhsBp BcdT/UN1LeV96mLu30DwGnJFqPKdtMRv2ZLi+fnJUYkCkHIwB8EdHm/f X-Gm-Gg: ASbGncsrFmk1ENxTKgmGrUBo1s60wF4dFk0u9JWhK1sfZnu9Sm4Akot44fJWQKlvIEe OHeUwmMMtCjMZevfxlIRW3babdAXcNXQyUNc1JDAqYHEHPAxSmhTxvsQnVwq8KD3gHD0kUeaKrr gqaAaN9eGvg6g8Rg6Bhtu6JKaeheM8AqNnw1MjBW5D2gqARUAJL3Ij7KRaMMtCaUyzcBj1RVi8D BIYGb0QY+QK0A6Wg5pAUDFGySifeB3A9LUqlRJGjjK5Y7WrfhWDVMGffsc7bALBDiRJu8aCkzhD /F87jKCsVrygSpd7qho2MM3Qx2y629FSk3MyxixkOvIpKu3SI9ZfU3ANbH+5HHqwVX2u/UH4gAB /7F1WtcOrV1idxMZreUtjZZk= X-Google-Smtp-Source: AGHT+IEFWr1YH8MDw2Ilwg3bJiMl5h7lT8nAHAQgZ4Vz7//XBKfw+/oB9z+iPi67tCsqExLcbkLX3g== X-Received: by 2002:a05:600c:1d22:b0:45d:d9ab:b85a with SMTP id 5b1f17b1804b1-46e1d97491emr18003085e9.7.1758617981648; Tue, 23 Sep 2025 01:59:41 -0700 (PDT) Received: from localhost ([45.10.155.11]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46d1c97a87csm80314205e9.20.2025.09.23.01.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 01:59:41 -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 , Willem de Bruijn Subject: [PATCH net-next v8 5/5] selftests/net: test ipip packets in gro.sh Date: Tue, 23 Sep 2025 10:59:08 +0200 Message-Id: <20250923085908.4687-6-richardbgobert@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250923085908.4687-1-richardbgobert@gmail.com> References: <20250923085908.4687-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" Add IPIP test-cases to the GRO selftest. This selftest already contains IP ID test-cases. They are now also tested for encapsulated packets. This commit also fixes ipip packet generation in the test. Signed-off-by: Richard Gobert Reviewed-by: Willem de Bruijn --- tools/testing/selftests/net/gro.c | 49 ++++++++++++++++++++++++------ tools/testing/selftests/net/gro.sh | 2 +- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/ne= t/gro.c index 3d4a82a2607c..2b1d9f2b3e9e 100644 --- a/tools/testing/selftests/net/gro.c +++ b/tools/testing/selftests/net/gro.c @@ -93,6 +93,7 @@ static bool tx_socket =3D true; static int tcp_offset =3D -1; static int total_hdr_len =3D -1; static int ethhdr_proto =3D -1; +static bool ipip; static const int num_flush_id_cases =3D 6; =20 static void vlog(const char *fmt, ...) @@ -114,7 +115,9 @@ static void setup_sock_filter(int fd) int ipproto_off, opt_ipproto_off; int next_off; =20 - if (proto =3D=3D PF_INET) + if (ipip) + next_off =3D sizeof(struct iphdr) + offsetof(struct iphdr, protocol); + else if (proto =3D=3D PF_INET) next_off =3D offsetof(struct iphdr, protocol); else next_off =3D offsetof(struct ipv6hdr, nexthdr); @@ -244,7 +247,7 @@ static void fill_datalinklayer(void *buf) eth->h_proto =3D ethhdr_proto; } =20 -static void fill_networklayer(void *buf, int payload_len) +static void fill_networklayer(void *buf, int payload_len, int protocol) { struct ipv6hdr *ip6h =3D buf; struct iphdr *iph =3D buf; @@ -254,7 +257,7 @@ static void fill_networklayer(void *buf, int payload_le= n) =20 ip6h->version =3D 6; ip6h->payload_len =3D htons(sizeof(struct tcphdr) + payload_len); - ip6h->nexthdr =3D IPPROTO_TCP; + ip6h->nexthdr =3D protocol; ip6h->hop_limit =3D 8; if (inet_pton(AF_INET6, addr6_src, &ip6h->saddr) !=3D 1) error(1, errno, "inet_pton source ip6"); @@ -266,7 +269,7 @@ static void fill_networklayer(void *buf, int payload_le= n) iph->version =3D 4; iph->ihl =3D 5; iph->ttl =3D 8; - iph->protocol =3D IPPROTO_TCP; + iph->protocol =3D protocol; iph->tot_len =3D htons(sizeof(struct tcphdr) + payload_len + sizeof(struct iphdr)); iph->frag_off =3D htons(0x4000); /* DF =3D 1, MF =3D 0 */ @@ -313,9 +316,19 @@ static void create_packet(void *buf, int seq_offset, i= nt ack_offset, { memset(buf, 0, total_hdr_len); memset(buf + total_hdr_len, 'a', payload_len); + fill_transportlayer(buf + tcp_offset, seq_offset, ack_offset, payload_len, fin); - fill_networklayer(buf + ETH_HLEN, payload_len); + + if (ipip) { + fill_networklayer(buf + ETH_HLEN, payload_len + sizeof(struct iphdr), + IPPROTO_IPIP); + fill_networklayer(buf + ETH_HLEN + sizeof(struct iphdr), + payload_len, IPPROTO_TCP); + } else { + fill_networklayer(buf + ETH_HLEN, payload_len, IPPROTO_TCP); + } + fill_datalinklayer(buf); } =20 @@ -416,6 +429,13 @@ static void recompute_packet(char *buf, char *no_ext, = int extlen) iph->tot_len =3D htons(ntohs(iph->tot_len) + extlen); iph->check =3D 0; iph->check =3D checksum_fold(iph, sizeof(struct iphdr), 0); + + if (ipip) { + iph +=3D 1; + iph->tot_len =3D htons(ntohs(iph->tot_len) + extlen); + iph->check =3D 0; + iph->check =3D checksum_fold(iph, sizeof(struct iphdr), 0); + } } else { ip6h->payload_len =3D htons(ntohs(ip6h->payload_len) + extlen); } @@ -777,7 +797,7 @@ static void send_fragment4(int fd, struct sockaddr_ll *= daddr) */ memset(buf + total_hdr_len, 'a', PAYLOAD_LEN * 2); fill_transportlayer(buf + tcp_offset, PAYLOAD_LEN, 0, PAYLOAD_LEN * 2, 0); - fill_networklayer(buf + ETH_HLEN, PAYLOAD_LEN); + fill_networklayer(buf + ETH_HLEN, PAYLOAD_LEN, IPPROTO_TCP); fill_datalinklayer(buf); =20 iph->frag_off =3D htons(0x6000); // DF =3D 1, MF =3D 1 @@ -1071,7 +1091,7 @@ static void gro_sender(void) * and min ipv6hdr size. Like MAX_HDR_SIZE, * MAX_PAYLOAD is defined with the larger header of the two. */ - int offset =3D proto =3D=3D PF_INET ? 20 : 0; + int offset =3D (proto =3D=3D PF_INET && !ipip) ? 20 : 0; int remainder =3D (MAX_PAYLOAD + offset) % MSS; =20 send_large(txfd, &daddr, remainder); @@ -1221,7 +1241,7 @@ static void gro_receiver(void) check_recv_pkts(rxfd, correct_payload, 2); } } else if (strcmp(testname, "large") =3D=3D 0) { - int offset =3D proto =3D=3D PF_INET ? 20 : 0; + int offset =3D (proto =3D=3D PF_INET && !ipip) ? 20 : 0; int remainder =3D (MAX_PAYLOAD + offset) % MSS; =20 correct_payload[0] =3D (MAX_PAYLOAD + offset); @@ -1250,6 +1270,7 @@ static void parse_args(int argc, char **argv) { "iface", required_argument, NULL, 'i' }, { "ipv4", no_argument, NULL, '4' }, { "ipv6", no_argument, NULL, '6' }, + { "ipip", no_argument, NULL, 'e' }, { "rx", no_argument, NULL, 'r' }, { "saddr", required_argument, NULL, 's' }, { "smac", required_argument, NULL, 'S' }, @@ -1259,7 +1280,7 @@ static void parse_args(int argc, char **argv) }; int c; =20 - while ((c =3D getopt_long(argc, argv, "46d:D:i:rs:S:t:v", opts, NULL)) != =3D -1) { + while ((c =3D getopt_long(argc, argv, "46d:D:ei:rs:S:t:v", opts, NULL)) != =3D -1) { switch (c) { case '4': proto =3D PF_INET; @@ -1269,6 +1290,11 @@ static void parse_args(int argc, char **argv) proto =3D PF_INET6; ethhdr_proto =3D htons(ETH_P_IPV6); break; + case 'e': + ipip =3D true; + proto =3D PF_INET; + ethhdr_proto =3D htons(ETH_P_IP); + break; case 'd': addr4_dst =3D addr6_dst =3D optarg; break; @@ -1304,7 +1330,10 @@ int main(int argc, char **argv) { parse_args(argc, argv); =20 - if (proto =3D=3D PF_INET) { + if (ipip) { + tcp_offset =3D ETH_HLEN + sizeof(struct iphdr) * 2; + total_hdr_len =3D tcp_offset + sizeof(struct tcphdr); + } else if (proto =3D=3D PF_INET) { tcp_offset =3D ETH_HLEN + sizeof(struct iphdr); total_hdr_len =3D tcp_offset + sizeof(struct tcphdr); } else if (proto =3D=3D PF_INET6) { diff --git a/tools/testing/selftests/net/gro.sh b/tools/testing/selftests/n= et/gro.sh index 9e3f186bc2a1..4c5144c6f652 100755 --- a/tools/testing/selftests/net/gro.sh +++ b/tools/testing/selftests/net/gro.sh @@ -4,7 +4,7 @@ readonly SERVER_MAC=3D"aa:00:00:00:00:02" readonly CLIENT_MAC=3D"aa:00:00:00:00:01" readonly TESTS=3D("data" "ack" "flags" "tcp" "ip" "large") -readonly PROTOS=3D("ipv4" "ipv6") +readonly PROTOS=3D("ipv4" "ipv6" "ipip") dev=3D"" test=3D"all" proto=3D"ipv4" --=20 2.36.1