From patchwork Mon Oct 21 21:59:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Chia-Yu Chang (Nokia)" X-Patchwork-Id: 13844716 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2072.outbound.protection.outlook.com [40.107.20.72]) (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 28C7E200117; Mon, 21 Oct 2024 21:59:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547978; cv=fail; b=IRCRlxzFna8pxsJSM7X2zjXjAseS19V5d2B1SHVnFeNcKK4J6Z2O985M5Xbqy4xjw0EVNYcckwuv3WIiNdF7/Av6UsCQEOS78WuTmHseIIGUdVGzBoLf/eqFUNIOUEOmxXjCNwbDS4YIATVxeAs0YiDXmlRSMMqzYUBjqTVuhfM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547978; c=relaxed/simple; bh=4j5SJ5HYuPel2Dv+IBBWRsO/17dTAoza3QBOY2Scc+0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=o5Wg9xZBDt6kCGFV7VQJ9/yZi6sWWGQEz+qw1XggbUW2hrUEvg8E/g/7jW0Q92YpXGyF7KUY3Hlr8vwP88lhuzH53prwdZgV1WriZLCDoSuBeArzm/UvD+1OGkct/v5tS+V9Q8UzOQV0JJAmy8nFgBzj84AKJVQ/YY5v8yVLhgA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com; spf=fail smtp.mailfrom=nokia-bell-labs.com; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b=K4EV1kT8; arc=fail smtp.client-ip=40.107.20.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nokia-bell-labs.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nokia-bell-labs.com header.i=@nokia-bell-labs.com header.b="K4EV1kT8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l973njf6aRltnSvOUjw7WNB3egpHjvSNZzt1UCUbkA1EPTK3yjmeo7XRHAz4+EdqiT7NdTdZ6QVrWCi8giM0BOR4G04i2Toe6DCcC+9CFgjjPMSywLZjxPXl+VrlydIzIenJxdriaDHcxkg45arSJ7ufiMfJolUVRYb+71/xhwEc59R7BI9Hrq/sAT5D0XCSVjVZ8FNWOMOMRJbH4MITu1nseFc/FfSiLV+ylFc75+29OteV2Yj3gXK9gBCZuCgWKupyLTgWIXF2WrTvhP2dsQn3irCHwG0U+oZhLEah5gSFe2q+za6tVapWDe79tk7klFx0ffnpBNA2YTClc83Oyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VSA7eqx5WtqjVvMOGIZmeD65xQRrVJgg0ZR6KM5OeDg=; b=RMR+qNveCLh9xmfhxRWbUpI4rdj2ZJWW6H0FYouNe7myq5XSFCQ2CvkeDPz9ntkG0BoHoGSuP4kZerNZMZLjsQn8D6icCAqw2+tr/Pd5sEAteOBKkme9D9r0GIR792s1l9hQLa6aJNwVvWSIYeevCcnmJA/KSNrNSyO81WETKcDh4E1/5C30mha9eFrewqJvLEtlRL7GynDQ8kM0qcCcJdxql5fN9jeGbtNMV4Vu0o40Vj39KaI1CgNikQUi354YwACDtJKL14ay/cgIQNf26ILXh8/E6UoAcRUfF7lO5kx7xjXw74O132ZQz5GtlYHQNgvUKu5c4qrpjmcjfdD4vQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.101) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nokia-bell-labs.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia-bell-labs.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VSA7eqx5WtqjVvMOGIZmeD65xQRrVJgg0ZR6KM5OeDg=; b=K4EV1kT83v/ODROGPe1DtDeCIvNN8kDWuM71PmHDYQyOUBn4t9DsIa7TcaisPiLj9z7jip0n6e5oPuNe4uTCXJ2rlSPZ6UwEI3P7jOq5it1RZkoaFSpfUHFtHy4Brn7che72oNB2v9qaGpVBZQo88OOd64qh1RjEJc2d9KIlsxXtyTZ4t9VJLM1sClyxnA310PUh6QbED0Dx+LxWK40HS58obyKuqXKkFIh2FNP+ZIEe3k9sKiYgdmVP8U1NMq3c0LIBtmczDbwOTSOX2IasrsdP+KmlMjTryQ3PqtCruH/SNHs4uviqdAIBqEiA1TRp3RmHK78RHflShCq9kivqtQ== Received: from AM6P191CA0034.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::47) by PA4PR07MB8389.eurprd07.prod.outlook.com (2603:10a6:102:2a0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Mon, 21 Oct 2024 21:59:33 +0000 Received: from AMS1EPF0000003F.eurprd04.prod.outlook.com (2603:10a6:209:8b:cafe::a) by AM6P191CA0034.outlook.office365.com (2603:10a6:209:8b::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend Transport; Mon, 21 Oct 2024 21:59:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.101) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nokia-bell-labs.com; Received-SPF: Pass (protection.outlook.com: domain of nokia-bell-labs.com designates 131.228.6.101 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.101; helo=fr712usmtp1.zeu.alcatel-lucent.com; pr=C Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by AMS1EPF0000003F.mail.protection.outlook.com (10.167.16.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Mon, 21 Oct 2024 21:59:33 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr712usmtp1.zeu.alcatel-lucent.com (GMO) with ESMTP id 49LLxENQ032273; Mon, 21 Oct 2024 21:59:32 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, netfilter-devel@vger.kernel.org, kadlec@netfilter.org, coreteam@netfilter.org, pablo@netfilter.org, bpf@vger.kernel.org, joel.granados@kernel.org, linux-fsdevel@vger.kernel.org, kees@kernel.org, mcgrof@kernel.org, ij@kernel.org, ncardwell@google.com, koen.de_schepper@nokia-bell-labs.com, g.white@CableLabs.com, ingemar.s.johansson@ericsson.com, mirja.kuehlewind@ericsson.com, cheshire@apple.com, rs.ietf@gmx.at, Jason_Livingood@comcast.com, vidhi_goel@apple.com Cc: Chia-Yu Chang Subject: [PATCH v4 net-next 09/14] gro: prevent ACE field corruption & better AccECN handling Date: Mon, 21 Oct 2024 23:59:05 +0200 Message-Id: <20241021215910.59767-10-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021215910.59767-1-chia-yu.chang@nokia-bell-labs.com> References: <20241021215910.59767-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS1EPF0000003F:EE_|PA4PR07MB8389:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c06c9eb-d1ab-464d-cca7-08dcf21ba5b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|1800799024|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?RBcQV9oWTNMaXCqIYDF4gBpVcj6JYbu?= =?utf-8?q?tDnZPslTCQQ7cTnw5wC3699yGM0lNUs7hbRgnrV/hJd4AE7iupS3xTv0LtW6sM3ZC?= =?utf-8?q?4/ZBOOF7YiIqjdFpuvNZc2noxoEzLj5NXFramqDB8flltbb3lyZV+hblqCjH2acxY?= =?utf-8?q?LNhbC5ab6S5lXBf9hCGKHsgm2dvniKpmZlc66e9j0+D9OqxhpKF7oxsZBrqaMvI0g?= =?utf-8?q?Tg80D3JwwYmmuFASR1DvzSY8wkoi5Zeg8Oy7Z8Upa57bjnx3NnLTccGaHBmtoiMBj?= =?utf-8?q?rtTBxxw+S8buu6u+nYiBvnCWyiKHaoXtR+IbFIiRV6h6xcze2ku0o4RaAesn0r0XZ?= =?utf-8?q?g8QHuQ2qMQhlfQDYl+gohbbV9aGVv12ipaWEc/aWpsxIERdJcGX0TS1Vvl/9CSnkL?= =?utf-8?q?D1VsSvFupB0x6Mn51JVfQkcr/55ztidjg6fCswuWS1RNXTQUCxXclfsTX0FupLyzr?= =?utf-8?q?Oq3yl/QBOs3XPxZrqwFpCUlr+47cfbXQSM2wiw7Vx9ki4Bp6RUbDFSBOdR5TW4B8y?= =?utf-8?q?28qirb2teO4Lk41cie1VqTvsblqy6OtyBIqC5Pqw30J6rZbLHlTEBaGWToao8OmqM?= =?utf-8?q?bmst87do8nwxj8Anc/tWPHTrdo5NQDT7bbiWHYw4aQKXnEx4cYlTJIcKa3ukWJO09?= =?utf-8?q?ewTKFz/JO1QEcx9D7TwkHPlEB9a/J7oW0H2zJIN2kRFXcd//czn0KZGfpMO3UBF53?= =?utf-8?q?GodxRUM8GwZxikFDfttrwInHI1zQNWaoGu6rjg5eRQkUGPkoaftVnnQE7cHHn3hpd?= =?utf-8?q?PlHHCvovC56alkx7Z9Nd1R9nUUHyVMDMEVEUq5d4lzO6oY1ZRk8jfyquE+luSDjse?= =?utf-8?q?Vub4SvcEsZ3FMlzjxi5F2cdblaJ+i6gKThiwr96pfO0c6UczBJvIiZi+E1MAW+H2S?= =?utf-8?q?AuA5M6ENcgOC4qMo2JmIil+E49CHnkkYmWaLJW/TwISbv4ZD+RebI2U9X51fz3JH0?= =?utf-8?q?rA63bOS/B4BeLJHLu2PBxR82MgRrmiiy6Bbe5XAlq1p9z3DP8XTeAVdqwcRCl2Yt5?= =?utf-8?q?CCOrMz47fw3Vv5UBO1UgExCX9oEWfSLB7Qwa+iHUb47YxjC/T0TgQdjXuvXzmHvmw?= =?utf-8?q?X02cGq4RepSJIgCb+FIymK3ssbd4gel09XaHEHP+M3mFOayTRm5OhpIisc3sl4OKG?= =?utf-8?q?8T32MSDRv/nWz2nuAZ2sIGeOr03L7vLAUrVGbdMqXuDiXr5tfFtV8SCuKlSxPExpm?= =?utf-8?q?hsMFBcaUZQYwGowPWR2ZUsS6YrJgOfnwbTt/OVrh/X3VyF8qmANo4rLiqXm09kBPY?= =?utf-8?q?2jAkwXkUVHRWniGHY6c8+A/PxQpYl3GlV1FWAhR5V9y7PT9jdmUienMq4en8mFhQ/?= =?utf-8?q?eUe+fdqx78loyKwSs7KIXNGkOueBaCLvhgEfNOZJ2gz4gO+uFI6Lopo=3D?= X-Forefront-Antispam-Report: CIP:131.228.6.101;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr712usmtp1.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(1800799024)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 21:59:33.6777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c06c9eb-d1ab-464d-cca7-08dcf21ba5b6 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.6.101];Helo=[fr712usmtp1.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: AMS1EPF0000003F.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR07MB8389 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen There are important differences in how the CWR field behaves in RFC3168 and AccECN. With AccECN, CWR flag is part of the ACE counter and its changes are important so adjust the flags changed mask accordingly. Also, if CWR is there, set the Accurate ECN GSO flag to avoid corrupting CWR flag somewhere. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index 0b05f30e9e5f..f59762d88c38 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -329,7 +329,7 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb, th2 = tcp_hdr(p); flush = (__force int)(flags & TCP_FLAG_CWR); flush |= (__force int)((flags ^ tcp_flag_word(th2)) & - ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); + ~(TCP_FLAG_FIN | TCP_FLAG_PSH)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4) flush |= *(u32 *)((u8 *)th + i) ^ @@ -405,7 +405,7 @@ void tcp_gro_complete(struct sk_buff *skb) shinfo->gso_segs = NAPI_GRO_CB(skb)->count; if (th->cwr) - shinfo->gso_type |= SKB_GSO_TCP_ECN; + shinfo->gso_type |= SKB_GSO_TCP_ACCECN; } EXPORT_SYMBOL(tcp_gro_complete);