From patchwork Tue Mar 18 00:27:06 2025 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: 14020100 X-Patchwork-Delegate: kuba@kernel.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013000.outbound.protection.outlook.com [52.101.67.0]) (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 BF95E149C7B; Tue, 18 Mar 2025 00:28:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257686; cv=fail; b=MaWyq4sEPbW8c2LNqt087H0a5InamaRs+9VXAQ+r1KiHFFIKfaD3nEEMCSkdwjIF5HaAUwfu+FxvkqC3Kw5VsEiyNwVbtkPqZS7RwPRB4sBIZ2jMuGgfTQaMgzYellyZnE4GP3VIrbV70MnXrf8ef1qXpsvkc0JLCe+SZSQUKUY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257686; c=relaxed/simple; bh=mcQJpmjSzL62FdjH+VYiKQ6QmWX5Xcp1sbHA6UPYShM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=jh8ziVykuCHn8RfArswHyUJcR2xGOin1KZ/+u/MGJMDAe4Os/Vq7Op5b7nJLT8InX135aUt0aOF8Ess34vM4pC6nq/EbSRKRJygdutG2C4H7v+cXmwnZrenwMUQXnpEUQlzYWTj4CELUJDPTqE7tiLvuGrWSOXELrOflN/6lY+E= 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=Uw5q3fGT; arc=fail smtp.client-ip=52.101.67.0 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="Uw5q3fGT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f2wjjZ6KBjJQf3T8jMJRg+0yKOa+S9L/SOhb7H7xLOtdn6UcJT3BkPMdckLyhOJyOP2ugFXSYR2/kTRdF3PYNFPtx6qWVIAAB4lsqDLsCiRUjhqRU3Kc6ave2SOb0yMKgugA8SaST3hIWYhcwlC3YPCpCj/Oo1YhxxWXzmnsBYxDNAm4MZJQGjFaLCfLrhhf0rcjodRVkaC6ULixA5BKaXVJ5uzGSKZunAsF+y4MCgFL05OtystpTkn4n+NyxqBh6H6v8hsmXHfeAfYfgzZNmfC5a6yNa6MsjqbQ2YAUNH+6o/LS47Juz94FQ6Q6/RWpu95t/T1ujfM3FUWPWdn2gQ== 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=Rs6bt+XzymTPEqXWxB38Qk5p3/58eWQSq/Au1qzRsdI=; b=lnEZyi13MjLCBNY4sGqhOFzp0+Jz1sC2l2i+qD5g4Y+4fPb3GyNS3/c5MoUVtZ8hpVoF6iv4Ls55EHfxftYVDmOdGdIei6t7hN6QTR23ug2gOoYR3qI0LIt+Nayj7LADip8w4HGixI7UP+4IY6zIe48cgpKzYjGQnp8SaFMyBmqWp+EHEN0P4vF4b3MQQTQmdDEx3XiiIdtljHzBBzu6vQm7FPjzhPf0TLfmksw1V6iIDyLeBwkjtrT3Y7e5On2/q7KY5nx3vNpmMWGWrAgRoj/GAI49FAMt4HsxsF4CPAhk9YATeC3i0LzPSuakpT+WPeUAz7bff7YXorqFhyvF3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.100) 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=Rs6bt+XzymTPEqXWxB38Qk5p3/58eWQSq/Au1qzRsdI=; b=Uw5q3fGTJUxD3lEp/HDOmtbckOYv3rXiyFiXlMmBF7dzuDALvbSqDX0ykCKhiiDz8q3CLs7jgx+iTehSLrIk/rTKlmfTaGSHXSZw01yk/iC5h2o7RTd/JuJUUXb0FaYi3c50/TFC4fM4IBI0isClFM9CCEpSzBwZzsBaOSfunSpuOrEsJwdeVSa4jIju/UED5p3q6IjuW9FfTw0SrsBHHNo1FdJbdDxwbbeduh7WKD5kGuLlLSK4sErevVxRWoX31X4AOhzxT/wG4nqCW4lDHhaEY1C9kctdqHUCd+cs2NoAiAkjheNOgwbh7kLS/LaDxKd83r8mMS6C2afju+9+iA== Received: from DB9PR06CA0016.eurprd06.prod.outlook.com (2603:10a6:10:1db::21) by GV1PR07MB9023.eurprd07.prod.outlook.com (2603:10a6:150:86::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Tue, 18 Mar 2025 00:28:00 +0000 Received: from DB1PEPF0003922E.eurprd03.prod.outlook.com (2603:10a6:10:1db:cafe::56) by DB9PR06CA0016.outlook.office365.com (2603:10a6:10:1db::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.33 via Frontend Transport; Tue, 18 Mar 2025 00:28:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.100) 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.100 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.100; helo=fr711usmtp2.zeu.alcatel-lucent.com; pr=C Received: from fr711usmtp2.zeu.alcatel-lucent.com (131.228.6.100) by DB1PEPF0003922E.mail.protection.outlook.com (10.167.8.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.20 via Frontend Transport; Tue, 18 Mar 2025 00:27:59 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr711usmtp2.zeu.alcatel-lucent.com (GMO) with ESMTP id 52I0RNBr024935; Tue, 18 Mar 2025 00:28:07 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dave.taht@gmail.com, pabeni@redhat.com, jhs@mojatatu.com, kuba@kernel.org, stephen@networkplumber.org, xiyou.wangcong@gmail.com, jiri@resnulli.us, davem@davemloft.net, edumazet@google.com, horms@kernel.org, andrew+netdev@lunn.ch, donald.hunter@gmail.com, ast@fiberby.net, liuhangbin@gmail.com, shuah@kernel.org, linux-kselftest@vger.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 v2 net-next 11/15] tcp: accecn: AccECN option ceb/cep heuristic Date: Tue, 18 Mar 2025 01:27:06 +0100 Message-Id: <20250318002710.29483-12-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318002710.29483-1-chia-yu.chang@nokia-bell-labs.com> References: <20250318002710.29483-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF0003922E:EE_|GV1PR07MB9023:EE_ X-MS-Office365-Filtering-Correlation-Id: d3a9ecc1-a4af-43b0-8229-08dd65b3bce5 X-LD-Processed: 5d471751-9675-428d-917b-70f44f9630b0,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?4nxYxlI93+L0GxBxZoZVLAQXjY17GtS?= =?utf-8?q?luzWDM1DxvXwttVWUjxQjxc9DeT6R9WlXPg+2AYQVU1ROyCHhxv94hNAZCIZEv8Hu?= =?utf-8?q?kGI9f0E0arDE/K668+ooB5TViKnodUuhVRRBvUva73SgT1AsF3ml+SAYqnlVjiZ00?= =?utf-8?q?ccJL6RZG0Ciz/1f9DabPRQR1LKwCAgNWn/4804mR0AIixTfK/EwT1Yzd61h/StpVR?= =?utf-8?q?UAEoGa+6RCCfC3NVDRoucNOcOn/ZjxQr+3fmnra8iTg4H5CKXFtgP7KYn7ZL3Kyr/?= =?utf-8?q?/NzGhR6UW5Cpuw5SS80exAFkDuLLwh3+Nn3ZkU7z8KQsD5axfSkvqv+cLL9VA0D3f?= =?utf-8?q?871/OB+ARzwW0Icj0FanEJTEvEnixzVHG+LM59olb78K/oiKWNa2sSG3achQy0tjk?= =?utf-8?q?EIJ2Q5Oiyhb0pyWebpS2qiAFswg1XR4HRkxMPh4ODn3oOnRzlDRrdcoHutJMhThSH?= =?utf-8?q?3bAGumtvoTebkSopHFuzwa06Krm4nZ84C2vWpq6U0d6QYymHHqktjOxR4erMAJXy2?= =?utf-8?q?YXAyYZAsglUt3dzmiwCge1bAPOYjJOcTeRqkVEAt5z8vwndT/5zKVtbHwRZ0rEIcq?= =?utf-8?q?E9ea+50C5pUabOv2D1CoMJuTrAWRm1N816nXi5dsT5SKplbwve7GZK0S75f/DvsMD?= =?utf-8?q?SzQ0/ODbWNq5btHfC0T7gYrii/Tpc+YLMORjCGIg9jGQs7w0Ts25HqXujKK/7iDDX?= =?utf-8?q?dS1yhDXsze0bR/tLfNEwbwFD2R0cSHYt9kozb1zPguP2UQK1GxwowY3+uuRgppbSD?= =?utf-8?q?JeZO3ND/jwFwe3EHBt7Krtds+7V5rPfE8LBKP7umZUhiiaJF4q9KB3roRl4k1Ewuh?= =?utf-8?q?Fm/DDe6tkwS8PtRo2v334PWJBMzGu/Ic5DK1Clvv2Xl+QRRJfptl1CbYsaynLXVNA?= =?utf-8?q?2LL8ddyxdA9S8PgqtK0Dav25dhHLaOLoFMtJbukZSQTq3WO2jI4JdOXa0A5OeoYay?= =?utf-8?q?lPjIL5Xl80GDmu33h/v9Eh1RMopabY+CLw7eSUmkLgHuTdXCRAh1gZZw/x0ip7SfV?= =?utf-8?q?rXBH95TACdy21mQ5Ckp91hmfww7/x9ik8VbLpuVgo3K04YFYdSScRiqk3BdgbgqnS?= =?utf-8?q?WoAWo4ZEAakTvw4h0/K/b0CJKE0IdbEGsf3tp4DariS5tfYdu+7/3EddIkzvokpkN?= =?utf-8?q?SkPvA2I/FTHXlO31KMkfRWxJSTa5zmgrLNuzOv1rbL+FJNUe6D23gRIS5alv72ntp?= =?utf-8?q?xdpKFMudvkm5sO+i1yO2p6XfMkqOHW46hCnU9ApSCCztEXp4ieFV4Bi8FX8SdyiaR?= =?utf-8?q?pekYoe6Vzm3aWx/CBxfoNBGxWWVanIuzSfZhToJD5STmVIa+tM52kRX66Li1tf893?= =?utf-8?q?aiMMQIWBM/Fvz6XHJ2iLrW2ZLk73b2wKyn0jU6Yx/uU4a2GPby5Tv6vDUxx1Bf1x6?= =?utf-8?q?/GZGr8x0AVxdtiK2rSDjkqqx/FIKdMTvxmswfhSYvaoZSpLdLyuoV/JCOLJA6d67m?= =?utf-8?q?1m6rFq9AV8?= X-Forefront-Antispam-Report: CIP:131.228.6.100;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr711usmtp2.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014)(7416014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 00:27:59.8249 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3a9ecc1-a4af-43b0-8229-08dd65b3bce5 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.100];Helo=[fr711usmtp2.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF0003922E.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR07MB9023 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen The heuristic algorithm from draft-11 Appendix A.2.2 to mitigate against false ACE field overflows. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- include/net/tcp.h | 1 + net/ipv4/tcp_input.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index d531da9f9af8..09220668d2e3 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -244,6 +244,7 @@ static_assert((1 << ATO_BITS) > TCP_DELACK_MAX); #define TCP_ACCECN_MAXSIZE (TCPOLEN_ACCECN_BASE + \ TCPOLEN_ACCECN_PERFIELD * \ TCP_ACCECN_NUMFIELDS) +#define TCP_ACCECN_SAFETY_SHIFT 1 /* SAFETY_FACTOR in accecn draft */ /* tp->accecn_fail_mode */ #define TCP_ACCECN_ACE_FAIL_SEND BIT(0) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d7498b1c9fb9..f62bbf6f4eb3 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -695,16 +695,19 @@ static u32 __tcp_accecn_process(struct sock *sk, const struct sk_buff *skb, u32 delivered_pkts, u32 delivered_bytes, int flag) { + u32 old_ceb = tcp_sk(sk)->delivered_ecn_bytes[INET_ECN_CE - 1]; const struct tcphdr *th = tcp_hdr(skb); struct tcp_sock *tp = tcp_sk(sk); - u32 delta, safe_delta; + u32 delta, safe_delta, d_ceb; + bool opt_deltas_valid; u32 corrected_ace; /* Reordered ACK or uncertain due to lack of data to send and ts */ if (!(flag & (FLAG_FORWARD_PROGRESS | FLAG_TS_PROGRESS))) return 0; - tcp_accecn_process_option(tp, skb, delivered_bytes, flag); + opt_deltas_valid = tcp_accecn_process_option(tp, skb, + delivered_bytes, flag); if (!(flag & FLAG_SLOWPATH)) { /* AccECN counter might overflow on large ACKs */ @@ -727,6 +730,17 @@ static u32 __tcp_accecn_process(struct sock *sk, const struct sk_buff *skb, safe_delta = delivered_pkts - ((delivered_pkts - delta) & TCP_ACCECN_CEP_ACE_MASK); + if (opt_deltas_valid) { + d_ceb = tp->delivered_ecn_bytes[INET_ECN_CE - 1] - old_ceb; + if (!d_ceb) + return delta; + if (d_ceb > delta * tp->mss_cache) + return safe_delta; + if (d_ceb < + safe_delta * tp->mss_cache >> TCP_ACCECN_SAFETY_SHIFT) + return delta; + } + return safe_delta; }