From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.45 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794680869; b=P/MIooBoj7UeeMStoFD3pvndwBSkUPLSQVJIxfIANisyycVK+/0KQYKuREYoykf8qeJX a5qJeW0a1+lRRgHVaYb1qGEMJTZLpA39A0QlNwEAiFIjBj2tX9NBl5LdxUxiWuSG0Hdz1 4jG0VS2HF1VX9VawOx3suKMe0+xMwy7oTLOveQ5XQlUtSq/3ooc0hmjdrU39FCAPVltRv gnI7G8Eu1CcRBr6v0ipRwY0EIIDssC3V3o6WbrOU8FTfcCkRYsamXmf9wTPDpVFMJLsyD tSsBPc3/yhBiClrTJPoH5FpuaiZWE+JSg1f7QPJ3eKQBwKKqRk5eqrfoFGdEBEEvKTg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794680869; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:MIME-Version:Content-Transfer-Encoding; bh=821hPZ3mSrVkDru9zjRsyXQ6m5zbLDq4PwmJzq0vjp8=; b=kT8yJ+ka1iQGJfOEf2ei/tS68UN9RTi68u9qxO8fGaXh6V0LxHU6NMgfrpJROWQgEwB5 SfquSXUb+FPq493Oi4VT40k+NTj8CMK7EPCL3O22Kvhrm6AVv9ex/JAkY4eC6tpjJg4uz XpHHkLJUDiLO6nZH/JXn3MSbNbB9L/9bfB7YSDYGT4Vkd2btTPSef3+jjpR2UGsa4JkAB Q4SdaFj1U0usBfOgOtqmwUfbuXSZypNQkdyKw5GswgcT59dW/2QsTnQTFlNylrIlR7KT6 LVJxWPktuMxYQsiN2gq7gepqjaxQNMSdbv6azT4HYyz7NFPzPGWNPhSbtGWtHcurBig== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bairaktaris.de; spf=pass smtp.mailfrom=bairaktaris.de; dkim=pass header.d=bairaktaris.de header.i=@bairaktaris.de header.a=rsa-sha256 header.s=google header.b=ez3H+WVb; arc=none smtp.remote-ip=209.85.218.45 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04087606A331 for ; Sat, 14 Nov 2026 18:27:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 04087606A331 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bairaktaris.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bairaktaris.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bairaktaris.de header.i=@bairaktaris.de header.a=rsa-sha256 header.s=google header.b=ez3H+WVb Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-c4cdc606b47so400218466b.0 for ; Sat, 14 Nov 2026 10:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bairaktaris.de; s=google; t=1794680867; x=1795285667; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=821hPZ3mSrVkDru9zjRsyXQ6m5zbLDq4PwmJzq0vjp8=; b=ez3H+WVb8N6kuW9DSLlXuva7AGxWZhqKOmf3bTmNJDi15V1K+XpPiqn6V3wnMJ+z3N DzTmTMxOpPKMtqA7m6sFzIVGrnsIAwRXMsGoD+ctZ1mUNaqCpcHfTX6ISVopadsOmS1Y dI4TZ5U0q0AmUZXHAhjAjKh+et3IsiEX+asKYbfP0RSUUyXOqZmBRTpM1SFqoJyZb+dD +g4scdis7G/SsRvmAROVwigJRQrXtsff6692FBvdeC1pmSKAA0CjlTVllh+LdX2AWD0l XgQrBIk9Rrt7/rxndra2MG1WboVkfpi3iiKakjiYIh/7/mv0nKFLH9qVf16/AhcHP5Of BcGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794680867; x=1795285667; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=821hPZ3mSrVkDru9zjRsyXQ6m5zbLDq4PwmJzq0vjp8=; b=hezZ3tBzvvhS0NmHyXOb5G++D+oLt9Zulkxdm+DBsX+qCAdtQarYIWc1J3kH4QxeWl J4SpC+DAcAbb6XQKwImpt58GIPThuCk1Uu3O0SP+4gwMjmyZmHVfcEGA4x9wwGIrPkuz iskcvG9cGS+1Ankf85CuYgVTXVlngtL8tBIQ4A1zgftW0grAMq11NfaRgKECr0+kBxAi fFwCh01lhXY6CDzlUZTT+zmvmNyASJL6q6abeEag/5lWuCQWjos1w9rwDtx26c/Pi8PF EWYBfU6T6iizVhmN6LQLsdaEJHjl3zdkWNstv10ZzDJ4bi3n3SJFmDQCSDJ3+f4FlINr z2wg== X-Gm-Message-State: APuU4Z8YtJDbseb11m6ZwVVGyBYjasRQbGYmPMVC1pFTayDDvgVFo0Xo LjLO22lwQoVlPHDtCVVExafJTx5C4JK7C9f4fOiNo1DAMk3GVklrwi7Ywv0jgba5x950VszVapf 2q81FzfGh X-Gm-Gg: AYBFou0CPWgRuQk2h9SgmFa+N2juu6rc7Agdg/6nv9XWHFh4K8hjZflW7wtzySeSqWz TW5bqeIL/ssh2ZFn8lWQG4Vr7q7u7M2x3+ec/gMwToI4frinbwMy8lqWGjn1m1Mt3Ae0p88pyuG mx0MPlhO0YuOxMyYX3lBWYkxskxTDnlgp44Dja8tJAGRhJVBWteW57Pe47dvF+qoibdq4vDMQpd Bkis8babj9dWNVnpjhde9U0oSm88wvNZHbhmVfQs+r1z25h198LbTLFEqGo397xFcEeeqLzcZYO K9okq7RWUdUBOakBc9YZKdVCD+gKYTZrKnj1nqyCic8EdWk+2RuGjpYESWqBbGGSBX9LVKUXb6R FadVaswVrqjjVklZSOb/3TWLPujcZx8mcojfzEpPzFkGxa1bVcXeakYXAFGnKHjEzsy1Iu4wtz6 FaAq5evArTrFO69XKMqWGPMef7xAIg755DyRw0fHnQ4esZXrMC7sLxSWHXUUXzHq6xNnhQzUKxW Q9ropiTFCe4s8s9KE7gBWoxg4jzRlmUtjpygDcFi4v90S6qO46+u6+mq8yIbuIiXgZpnxu7QZiw cCws/MHEP7gxZTbifNB68oWcE88b15NM1pM2O6NT5cZLMqOe5/9h7pvvoCtVRMf8QSKRPBQjs3h jyk0iCsXQppDN1Dd4vaowc83skK7WC0n8tpU2irKk0F6b9s7Cr4f4W9cJgSpucz4PU8L/IuKYeY 7GEd1zMvolVJo3I0PmabTpfTBOMA7CtAc3S5pL5RfmvPfZq4VDtlSnFzJs86EGxZdb4j+rwmdBr M4agwzEg8/qAOh2pKPGOirtdy0lJI8zXGax23r4DBwmzNB6kLvR//H4VswotXTH7HyJcTzfBdj8 9GE= X-Received: by 2002:a17:907:86a6:b0:c4d:4be1:4197 with SMTP id a640c23a62f3a-c5096410ca0mr549445066b.41.1794680867320; Sat, 14 Nov 2026 10:27:47 -0800 (PST) Received: from Desktop.fritz.box ([185.181.130.189]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c5095b56df7sm245554366b.47.2026.11.14.10.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 10:27:46 -0800 (PST) From: Julius Bairaktaris To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, andrew+netdev@lunn.ch, dsahern@kernel.org, idosch@nvidia.com, ncardwell@google.com, kuniyu@google.com, richardbgobert@gmail.com, willemb@google.com, ecree.xilinx@gmail.com, linux-net-drivers@amd.com, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, leon@kernel.org, linux-rdma@vger.kernel.org, alexei.starovoitov@gmail.com, ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, sdf@fomichev.me, martin.lau@linux.dev, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, emil@etsalapatis.com, ihor.solodrai@linux.dev, corbet@lwn.net, rdunlap@infradead.org, skhan@linuxfoundation.org, shuah@kernel.org, bpf@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2 0/2] net: keep the TCP fixed-ID flags on the header they describe Date: Sat, 14 Nov 2026 19:27:43 +0100 Message-ID: X-Mailer: git-send-email 2.53.0 X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit GRO sets SKB_GSO_TCP_FIXEDID for a TCP packet whose IPv4 IDs do not change. Since commit 3271f19bf7b9 ("net: gso: restore ids of outer ip headers correctly") the flag describes the outermost header and SKB_GSO_TCP_FIXEDID_INNER the inner one, so every path that adds or removes a header would have to move the flags. None does, and a TCP stream that GRO merged and that crosses a tunnel boundary is segmented with the fixed-ID state of the wrong header. Patch 1 lets SKB_GSO_TCP_FIXEDID describe the innermost header again and replaces the inner flag with SKB_GSO_TCP_FIXEDID_OUTER, as Alexei suggested in review of v1. Patch 2 adds a selftest. Tested in QEMU (KVM, KASAN and lockdep) with the selftest, 18 cases, 400 segments each: - net (30c71476d842), 2 of 2 runs: 6 cases fail. Fixed inner IDs increment after IPIP over IPv4 and IPv6 and after the ESP tunnel (390 of 400 segments carry an inner ID the sender did not use), the outer IDs repeat after GRE and VXLAN over IPv4 (10 distinct outer IDs for 400 segments), and a VXLAN stream with fixed outer IDs keeps that state after decapsulation into IPIP (10 distinct outer IDs). - this series, 2 of 2 runs: 18 of 18 pass, no KASAN or lockdep report. With a tunnel inside a tunnel, such as GRE traffic that GRO merged and that is routed into an IPIP tunnel without decapsulation, two flags still describe three IPv4 headers: the new outermost header takes SKB_GSO_TCP_FIXEDID_OUTER of the header below it, as it takes SKB_GSO_TCP_FIXEDID on net. This series does not change that case; it gets a separate fix. Changes in v2: - Keep SKB_GSO_TCP_FIXEDID on the innermost header and describe the outer header with SKB_GSO_TCP_FIXEDID_OUTER instead of moving the flag on encapsulation and decapsulation (Alexei). Encapsulation then needs no change, which also covers ESP tunnel mode with crypto offload, missed in v1 (Alexei, Sashiko), the Geneve GRO hint path, which sets skb->encapsulation again after iptunnel_pull_offloads() (Sashiko), and BPF encapsulation followed by an L3-only decapsulation (Sashiko). FOU, which pulls the offloads twice, clears the outer flag twice. - Keep the encap_level reset in gre_gso_segment() and __skb_udp_tunnel_segment(): v1 undid commit 5197f3499c47 ("net: Reset encap_level to avoid resetting features on inner IP headers"), which with remote checksum offload masks NETIF_F_HW_CSUM out of the inner features on devices without it in hw_enc_features (Alexei, Sashiko). - Drop the segment routing changes: the outer header there is IPv6 (Alexei). This also drops the read of hdr->nexthdr after iptunnel_pull_offloads() in ipv6_srh_rcv() that Sashiko reported as a use-after-free; ipv6_srh_rcv() is unchanged. - Convert mlx5 and sfc to the outer flag (Alexei). - Selftest: add an ESP tunnel mode case offloaded to netdevsim; check the inner ID values, not only how many distinct IDs arrive; skip the decap cases when the IPIP device cannot be created; fail a case whose receiver reports no result; keep IPv6 link-local traffic off the tunnels, whose tx_packets decide the GRO skip; remove the temporary file on exit; sort the Makefile entry; wrap lines at 80 columns (Sashiko, NIPA). - v1: https://lore.kernel.org/netdev/cover.1792857378.git.julius@bairaktaris.de/ I used Claude (Anthropic) to help write these patches. Julius Bairaktaris (2): net: keep the TCP fixed-ID flags on the header they describe selftests: net: check TCP IP IDs across tunnels after GRO and GSO .../networking/segmentation-offloads.rst | 4 +- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +- drivers/net/ethernet/sfc/ef100_tx.c | 12 +- include/linux/netdevice.h | 2 +- include/linux/skbuff.h | 4 +- include/net/ip_tunnels.h | 1 + net/core/filter.c | 1 + net/ipv4/af_inet.c | 8 +- net/ipv4/tcp_offload.c | 6 +- tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 2 + tools/testing/selftests/net/tcp_fixedid.c | 411 ++++++++++++++++++ tools/testing/selftests/net/tcp_fixedid.sh | 400 +++++++++++++++++ 13 files changed, 836 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/net/tcp_fixedid.c create mode 100755 tools/testing/selftests/net/tcp_fixedid.sh base-commit: 30c71476d842b094651bd7712f6c8ee8716147d0 -- 2.53.0