From patchwork Mon Apr 14 13:13:13 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: 14050389 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060.outbound.protection.outlook.com [40.107.20.60]) (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 72C6C2E339E; Mon, 14 Apr 2025 13:14:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636466; cv=fail; b=iZ4UddyxRrAexhWsksx2dsAXhgXm2c3IiDZTzVeUTDl8d1WplfA6/xKhj/wbKB5U5AMtzK5rYplefzKoa7j8a3zUzH+17LAg0YovnoQv5eiFSi+9JyLBxot+ZK2wTbxCFwXY3RO0umpa0PwFpvMBmxSbCSASQDO7+Du6sdfEayc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636466; c=relaxed/simple; bh=I4ubTWT3RFl5BeQzn9ugdonkuIPtlIVxMelUvF756Yk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ZqDLpBM53mAVyP+iDtMIWqr/Rr8dFgeOK5aW8r74GsVPkP2WBAnXiyrPdMEWW5DGUSOXMfFs+TU2bmrMNsjvEy11TtJ1fhitq1D4fk1G+wJQHY9IJ+MB1AINTd/0lqUuXJkfv/9hrG3lZe+/HM2gsPO7MPSSdZL0fi6AbkaDrSA= 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=GOG0XxXL; arc=fail smtp.client-ip=40.107.20.60 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="GOG0XxXL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gtkaYknftc5WIn8xbX4tvCiYw7YXn2wZUafF+UlXAMqNDwpsTXgqR/E/5PN0KF6tfEYKoGn5KFfPlTmtwDqbvzmzcJdiAmSbW05Uj6BLbotWGMPiwxNroEJhprNkIdQl/Tx4mezMmbLUlvMkBH1OO11/ZGlaNt9ULENzTt1Rql/PqfqPOXXPdoFjKWP16c+9aLmCOqJtfdCWNL1QRyOt3HrpuBeHHiRHeZlKH+kqvylD3DYUljKPp7czM16gGkLb8NfAg586evFYUUhazxp8qRx37V95He7Edn52aV4glEnyocosE491htMhp3bZWeC0cbmUrP+k3aT0cztOY/bv1A== 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=wjzGCXWtVKbrVv/LQ94yH6VK8X9J1eeWY+M2JK853FY=; b=WbbJ0WGQrbEE7GvzyKbFQ9JqTCLuL+hsSZXVv7dmaG1KQ8ara3egX2seegXyfdapQIXDPum1UpkyIYhTDPX1IrtJwEZfGOSWAIYIgU0dQlsCuqnUe66pJhBHoOhQEgTZDsPEAqaKtotXweqj81OQkqlsdiPLgu9uVpZPKTLdbS/ZVBaRTwBLo1RwzhrZJQ5ewlFu4BQlFhFYevPHtwAqKBEVDOWH5yEWp+lElDoTmResynKhCBFC+ecsVgJxd0Zkm6b5UVfSJwwhpEHxm25qDdU8Jjf5BMDV8rcVdQ33i60BfbV6nsbUWgpZn5puT+3YbCZkcHmVwlCdp3FXX5b2Rw== 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=wjzGCXWtVKbrVv/LQ94yH6VK8X9J1eeWY+M2JK853FY=; b=GOG0XxXLwNtm/ScwK2f2N5Mpq347TX8+MlJgeo+ApX7p9INyPGfgcIVN0L7cxx5FOg5tDsBghMmzPG/Zm32idYMXEnDZk5Dwj+obq7yiwKfjU05gZM3kSiI3jNN/TsXIEDIzxKqY8Qlo75doeh0MDQe8QBtp9Wkp9fIwA5LTscbyT5Wjn6K6Akno1WOTHYGqqf+PLg1JUAs3oEaWsq8/meKtljQjaX3z8kxjfRHzfUOHkJ0sxMjOgV/l3KvZyVZ5IGPCzWFZB9NZ3O3uisosWGWj4DHY9sc7ly0EcyHPz6gWxOLUohxYIWBm8ge74jjuXxX/WlvARqHwH5KWa69czA== Received: from BE1P281CA0483.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:7e::25) by AM0PR07MB6244.eurprd07.prod.outlook.com (2603:10a6:20b:15d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.33; Mon, 14 Apr 2025 13:14:19 +0000 Received: from AM4PEPF00025F97.EURPRD83.prod.outlook.com (2603:10a6:b10:7e:cafe::3) by BE1P281CA0483.outlook.office365.com (2603:10a6:b10:7e::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.15 via Frontend Transport; Mon, 14 Apr 2025 13:14:19 +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 AM4PEPF00025F97.mail.protection.outlook.com (10.167.16.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.4 via Frontend Transport; Mon, 14 Apr 2025 13:14:18 +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 53EDDQBO009623; Mon, 14 Apr 2025 13:14:17 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 13/15] tcp: accecn: AccECN ACE field multi-wrap heuristic Date: Mon, 14 Apr 2025 15:13:13 +0200 Message-Id: <20250414131315.97456-14-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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00025F97:EE_|AM0PR07MB6244:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d378463-792b-487b-ec47-08dd7b5643a0 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|7416014|376014|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?mRUwYf7F3926wQA2OhQCWeliRnJzjTo?= =?utf-8?q?A5H6ozk4jc2kaR3LQAjlpdIXnO8GfiOKeWOIjrnSCv2pWBT2X0zHNRiU8hbI3DvW/?= =?utf-8?q?iLSKpVC2y9FJI/mF5MFMqlSQAp3ThX9o51p0xruOD89JjwLE4fTdQqnH6U7MHEB/R?= =?utf-8?q?3QuasDb4Kj7LErb/1vHuYbPufBFGfbLc2ao0ZoNzt5+Bn/4JiY+g6QjHqF5nx6Rsl?= =?utf-8?q?tS5g2oIMeForP/zMf2zSqS01MXBHfRe3J+FQ0tG/REvAgLyvcE23v6QTwTML2TaXJ?= =?utf-8?q?Qle8cPob49Pz7zIYI1bYRRY6uMxigsMmWaaOQG2KTXRABKoHthaKkxN9PLBU2bVTX?= =?utf-8?q?SuHobb4/DxyVnGkTvLUQQoVl1YlND0g2njnTnEGgnseIXfuF4KOtOH+FMssE4zioB?= =?utf-8?q?TLizRGYVElpWJa6YH7PQxjIPxqH0Kq2CxLsE1KKpeW//23GM3gfewjJiZP80prhhi?= =?utf-8?q?ZgClkMrIg+e3d6hOzKTcl7tw52h6buK6y1+p2UaAXxvykCkP6T3wYebRf3xGqoYM2?= =?utf-8?q?Lcsjzi1e+hpGbiSzS6m6qcmFz4Y5DsQEAfKQfaFL0Fncm6DCpMaNUz0KnZDIY+CLD?= =?utf-8?q?5lF4tPKYLII/prAX4Y/AyxFPb1nd5g5B2+ogdRLbJGgeuHHaaDpHwgwPPNYhxACDO?= =?utf-8?q?9edxYkMOisTVscgU66S24DgwUpm7s6SOzVBwGwKy5dN0jZvUJlit9+wltV3/WdGBo?= =?utf-8?q?AzLXohyeWwyW0d2kw6ivO5iq/SVOv6ulFJId8Y9c19t5SCGXGRg0P+dKej/tv8d3f?= =?utf-8?q?9sWqzAAJ47KBQULjUsusQBFUd5MbU14LNw9j4NvlPsC6e1RaMco36rS72ap+g8Oam?= =?utf-8?q?BBXb4c03tNKtjrYlHXtLzFzSpkCMtTyTiW9oLbgcNP1CZnQTVRiCmq5rfHlw39WGa?= =?utf-8?q?uPV9Z05zyu/vWHmxhMbVxOmFZHPGfE71/DSegCcEXhFVurDdzFqJZkG8pIkUvO24i?= =?utf-8?q?Hc+0vIXyG0k4TV8r8HsRO8NAeX+so3jJVpYIWV+5OQHLJEPkSpA8veM3Ogdmd9nPA?= =?utf-8?q?mJLT1yFTqUjjJK5Z6PpEuHpsfEaqcHn1KnkoAB+nWT+9EgNjfxWVAdphL11tEu/Yi?= =?utf-8?q?2yNYVleeVQrENnF5g52vTKMwFeXj5SPbHK+/jk+GjBaB5iYkPU4Y0sBFNZZim/vfW?= =?utf-8?q?HVm8jbbKnfFWs8gzRBQRfosus6O2BuDF/8B6TUtT5puak34D9Giov6+bDsbJKicNl?= =?utf-8?q?GN0QT6dF9YCq0I4R2dKd6im90P6Z3NJJiqGtdQ/gQS35i1HXwaO5hHTxvLLnpIipE?= =?utf-8?q?BXrHO9Nxrbc5Ww/yEatZwqfBgf+7mxa5zCOW2P2GpcZP25LMlhxsP6JUzHpX+Y0wK?= =?utf-8?q?IK9wSPtP2nRMzHT/JrYSaztqIisMI6GMAciEumIiMIl4KH5z1hVzFUpPHgfOcuj3b?= =?utf-8?q?YCQ7G9iM0hAdungvJfL5a7ZykbzM9ifjRlvRcNqJdHPDGjCUyjNzIpTxVJWhs3UVQ?= =?utf-8?q?EKXNh88pnoFpzMVERLr+j4yLz6pSCdHQ=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)(1800799024)(7416014)(376014)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 13:14:18.7736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d378463-792b-487b-ec47-08dd7b5643a0 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: AM4PEPF00025F97.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR07MB6244 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Armed with ceb delta from option, delivered bytes, and delivered packets it is possible to estimate how many times ACE field wrapped. This calculation is necessary only if more than one wrap is possible. Without SACK, delivered bytes and packets are not always trustworthy in which case TCP falls back to the simpler no-or-all wraps ceb algorithm. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_input.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 54f798161d14..c6dac3c2d47a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -733,6 +733,24 @@ static u32 __tcp_accecn_process(struct sock *sk, const struct sk_buff *skb, d_ceb = tp->delivered_ecn_bytes[INET_ECN_CE - 1] - old_ceb; if (!d_ceb) return delta; + + if ((delivered_pkts >= (TCP_ACCECN_CEP_ACE_MASK + 1) * 2) && + (tcp_is_sack(tp) || + ((1 << inet_csk(sk)->icsk_ca_state) & + (TCPF_CA_Open | TCPF_CA_CWR)))) { + u32 est_d_cep; + + if (delivered_bytes <= d_ceb) + return safe_delta; + + est_d_cep = DIV_ROUND_UP_ULL((u64)d_ceb * + delivered_pkts, + delivered_bytes); + return min(safe_delta, + delta + + (est_d_cep & ~TCP_ACCECN_CEP_ACE_MASK)); + } + if (d_ceb > delta * tp->mss_cache) return safe_delta; if (d_ceb <