From patchwork Mon Apr 14 13:13:12 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: 14050363 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011011.outbound.protection.outlook.com [52.101.65.11]) (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 3C1AD2D3A87; Mon, 14 Apr 2025 13:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636463; cv=fail; b=CxMik0fknLJ2lYnTl9ShL4Jtw8GSK0kJFqiZN+jAoQysi1IfewGMBYyWGIw0ASSSnBZigBenTeodHtadClq9exuC/9XBwfrP8wT56bQYE5nwBNN/6c4IwAW5TZhG8j8ZXX3KTw/UkcssbFezwAbZfX9eo9VQJ6iCpYo+BMq6EF8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636463; c=relaxed/simple; bh=O+Ij6PnJNya24eNiQTfN4/gm9ym90RRZa7lNIALkuHU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=U+G48viRewUC4AZvWXd64RlLUnl/2Z4lDCUgb/6tHQGVFUyfg2J2wC69Po339nD4/ffC+y0GNluwLQ6XuMtQ2qZF9AGpgOricKmtXusMaMLpWuEoldbHmZ5ujZbmfO5Y0Ja8JaooWBoGy+wSWMS5d5OtOws5D9eyMt6QkBZ3Kzk= 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=AcKRU+rg; arc=fail smtp.client-ip=52.101.65.11 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="AcKRU+rg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qIJql9kDWJoo3bSU+LXdF4OmauGQLc80cuCkWYvFN5tI8GRshgU7ktq0LSTuXyS4dsIsNSB16Xdu30fzoTgge0cigjJt6zY7jw6FBxLtB+2WstDajqmTEqvGjIrbK86KY6S5UGnT4N4tEFTDQZ9YKjpGCaDe7/KWYgqUzqCwBFFO3T7o3PKU+oXZgmVpD08cuxHaPk2aLtkXx0DrcIfXH6kzH8tzGxndEXmM5qTdagQgDslfeevIBgeH28F/Tn89HcKsUUugo+L9A4Ldeq4LPNJPXfI7Od2RzponIwT9a5OTLsn9TJLnQfLjMs3y2g2+PZdPl2hwH9G3T++kpBjxXw== 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=HKL/5UK0OSKaRdCSKsrub6d7dkYoherKF2ghFpWUBbM=; b=Tb2nFWHBuSSzOFSPXiIvLE5rcacE95lPSA2+FDR5FcmPlh/it5+RyQgCP1kzWcr9W9KyYmC5ae+N0dmOL/D5ZipsKv71X4TAQPJSzXsz/dbxFq+L0X0r6wM47B2oceyB0Hsgt1jaizdE/beCVuTxwaKgeuPRuBRZ/Gn8NfU/1TtTuABcmDomhE5nbVGqDYi9rjbCNl619h2wjzHQoI133xUK6RR/9LGxJkGMSQnATly5Czi37rgPrusp7VyyEhpdO0jmuDQ+ZKJ1emlotfNtv3fshzrT3lt2/xzbbTDRUL4MSA6TZg+efCLPZWhELP7YoQC2Tm3T4+9f/t99SuqRbw== 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=HKL/5UK0OSKaRdCSKsrub6d7dkYoherKF2ghFpWUBbM=; b=AcKRU+rgv8sSxZ5pA2n/E4T8JXElGihib6rvoyEW6RoKszauyeOhFjzeCjwG7p9X7Vi2Z6FL8mhf9TSFBizHB74TN2mhNj+A0s05fwSsRLBocqDPlhS6v2vAutAXmXqEhWbV5LC0oRDJERx/+V75uC1DtknZJxxf08YGqr+Url0tlSsO+CVRkzEECZAB+gRrcaLpHL+p/ZmC2NsOY9bcm22LKru+7V+YKhNJGYeXQuqFKCbk25kFvNPkbE5KmG2mf+xRxTjfwFezdyXSQJQZfrUo7E38ttSMZx2i7/gm/+rWWrRBtXbUUoUaet4ZWoMLmr+B4f5xUmAAni7M6pOTwg== Received: from CWXP123CA0002.GBRP123.PROD.OUTLOOK.COM (2603:10a6:401:73::14) by AS4PR07MB9657.eurprd07.prod.outlook.com (2603:10a6:20b:4f7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Mon, 14 Apr 2025 13:14:17 +0000 Received: from AM3PEPF0000A791.eurprd04.prod.outlook.com (2603:10a6:401:73:cafe::d6) by CWXP123CA0002.outlook.office365.com (2603:10a6:401:73::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.34 via Frontend Transport; Mon, 14 Apr 2025 13:14:17 +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 AM3PEPF0000A791.mail.protection.outlook.com (10.167.16.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Mon, 14 Apr 2025 13:14:16 +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 53EDDQBN009623; Mon, 14 Apr 2025 13:14:15 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 v3 net-next 12/15] tcp: accecn: AccECN option ceb/cep heuristic Date: Mon, 14 Apr 2025 15:13:12 +0200 Message-Id: <20250414131315.97456-13-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250414131315.97456-1-chia-yu.chang@nokia-bell-labs.com> References: <20250414131315.97456-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A791:EE_|AS4PR07MB9657:EE_ X-MS-Office365-Filtering-Correlation-Id: 39e10be1-492b-4bd1-261c-08dd7b56427c 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|36860700013|376014|7416014|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?3ygHs1cUJ9GEACjfYWCLWZapJQ412+R?= =?utf-8?q?3PHRHBABBaqTZNkNMHX79PJ0IrQIMg8HODtr7cVZRSL8AJxaufumc4SHpmYXq+VH+?= =?utf-8?q?/HKZuf5BNxvUPvLixILYoZZQnxwtfEvZf/a/oDSxQwBKI/Ge2bU5ZCH0krTcsKISv?= =?utf-8?q?dlE8koyBuHfLmXKCNSO/rqKShMHmDSMPm5VVjgQ/X87oCoYO+9/4vqrdNh3dNlEIb?= =?utf-8?q?vOiWJI0pU5/QQmc0TfEyzSTzzcwL/WLKlCK0W6jcYWkSwT1XgOpMY5gKZT6v1ddc9?= =?utf-8?q?zdQslh0uIQWvEKjl4+/Q1KIAt176iZDh8j4VbNIfKqpU7lyHKOzeR5QqP66YZH9mw?= =?utf-8?q?nLWBmk/sg82c2nUB42zp+qrp/Ew1RmiTMl/MQty9bFeRrDNYyfMutxQj0tAkkoWps?= =?utf-8?q?5Q6g2SKWnMwgah5PGMOkVq1otQMGzXkB5c59o2K1f6OnTLWZq9WepPdtt5KW0Zm8B?= =?utf-8?q?JOS9xBdtv5GiXyRHTg6wfvdZW+TPVtAq46P5oSuNL/tDjJbpxXV9+0eChDtpwu67+?= =?utf-8?q?We7EAT9qanMOm/8i90fYm0chDSXuEqrGvhm/1dBJawYejb6UMS7klNen0QBiW4Xr7?= =?utf-8?q?EmvuPWkX9W0E2fIauCidIijbaY8rYcCsHXF9kymlgisdeCGbx//KeZ4Iwt1MrtgKt?= =?utf-8?q?zWNFfzE16L7UMmy0e0OnvdsVzTMKGtW9/fzTyaToEp5UppnweWSBQPJCPey6Cjv1m?= =?utf-8?q?1hVWjPfqE1HSeLoA64IbTcWn8i8IxtFwVPHP3Q0Y+ezYgj2eHsAqygpyTc9EZs5X2?= =?utf-8?q?1VKcNMoVCkhAhc2xAHxLWN5/kM+fs/1kzm6vSFZ6XQEPhnkvJNX9l2SEADCMNBPwj?= =?utf-8?q?kefo/ZbbfdigruTmSt/F9VE/JSiQUV+pPSwFfu2RhkNP6RABYS6sYqA0vjB2PUCqY?= =?utf-8?q?2prr8PDgCA+r//w0LHawpII12frKZ4Uv2QltWItCeylSoaZ8v/uJrpFbqqg7Tk/vu?= =?utf-8?q?ed8c+0jWSxmVTth6tGnPbpT7hskL/3iNBfgLAq/0MCatUpJWARE43aD9AtzVMxWNi?= =?utf-8?q?hDHy4sJsbByqEzqtx8WrOULMifGnb+unlW4KY59kIUaX8I/Ac1gTV0o5tfeMLBCp4?= =?utf-8?q?/riK87xTA2HCZ0YSRVya+cp9K5AQkk/Hiq9oy4vGglVhQUfZeRIGpeY5g1YBlgequ?= =?utf-8?q?bEVk9KU+WOElYMrQMrLid+XhpPpOgCzanSWi7NF728nopZldb+XxdUYEt+lV1Qjbv?= =?utf-8?q?mjhme0tdtL9o7p9iTr9EMFj8ke9HimYTOo2Xrqss0KdyC7HcS4JOOCOvDuNopPEG7?= =?utf-8?q?MmKnB79i6D9/Bz14zOsBQHjhxiObAHDL0YEkdY1DXI0cZPtSQjujJyUGtmS89ufrl?= =?utf-8?q?DqulZ+YRy9cTO+uvFVvBDc2ydAl+hVl/7ZJitQbFSV6c525IUfazJfp7iINjGwIfy?= =?utf-8?q?j9y4ROccvdPhsWtBmZVi480s5DE/nIlS9xWDyx/CYizSGONjFmUOv+wBwAuh2cJXm?= =?utf-8?q?RzQLA4uI6p/UuIP+ohwxJlukIRRdculw=3D=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)(82310400026)(36860700013)(376014)(7416014)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 13:14:16.8533 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39e10be1-492b-4bd1-261c-08dd7b56427c 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: AM3PEPF0000A791.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR07MB9657 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 0ade2873b84e..3ceed4792d13 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 8f1e10530880..54f798161d14 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -694,16 +694,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 */ @@ -726,6 +729,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; }