From patchwork Sat Jun 21 19:37:24 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: 898920 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011019.outbound.protection.outlook.com [40.107.130.19]) (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 3AB4C27054B; Sat, 21 Jun 2025 19:37:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750534671; cv=fail; b=f0/6ToFDB9FRHUg91V9fKbAdAPKfUHaDZL7Ohh/+9+/nnqLBGk98s5o2XZVnu7vuiA1B9mwfhdIlCg79EXTnywSLUrW2aN4nJ4nofDOjdwMLnEruHEb0RV98APKwLUf1b6Vvlmfzb2f/1rDDuyvgH/ZPoZu0B4mu3tpXrgwtUF4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750534671; c=relaxed/simple; bh=HrthedlZLSF5PvL+mGmj96I5YV+Xk4AUUKoKHivcNic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=b1VlsvA5nN5/vrGt5ketNpv/ZsF5euDCpDhA00+jxfsf4yOfa/2NGxAbTRjSCRLfrbLCuy79vdvAUTyRmE1DCBjYX7lu7qvIxN4RwYFtosTLWCgHlMqJb7mJd+Wyck2SVeU7D0eZohLSpZ6/U4d7lvPTlNTg0zLVwd0cHmBnqYQ= 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=Spc3uUx+; arc=fail smtp.client-ip=40.107.130.19 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="Spc3uUx+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kRz8eQA5jgBYZAAr/3fKITok8//mI6BhoABVrLYPSiIdFycqILCQ7QhO395Ri3WF5494wrmiYP0hCtHKdrsSN/88V39Z4Baet8IMfTjPGSNKcmfcBZV9TPxoPp65rySwMIjPRYzO6hFGPzf9ZocE6KiXGbjEgHy4zHzsu7U47rSRJEwK6aVr+OwKFdMl7C2mRVz3qfEckRm7n7MnRmo79g4+0gSKcjQlrbdLXhfmvBpZzdY2PvUCV3fyPsDeTP/2qYTLIbZ9RdRomrIzPraVLlh+p6UAtNpYB23NeOpTpW0giKh5B9YGHWnnm0dMXMVxfiA2EfwuiO+p/XIDMfFOuw== 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=GxhDhWo+zuu9Jb2jKlYN8O7BEJ1zmYitwA27xZNz6d4=; b=KBDkKMPW7JGPLF+fYR+dMrLIOKgEMgXc7TVA8rD3P3wz2XherQF6GDlR1RGwj2j0nGuf3MUR6KXeYYu0Q3CkR49cer/y4cKnKm5l3rkc+h7Zb+nQt1vA0DzjA1rzuoDV7U1PRhy8r7iXK5Go4GmfPKW1EAFNSDkwDUd7KT2OG+LZwSK47nnKw1UjCRn36jC06JTsoEdoVBdPYY7EMmiHXDvKPTM+IAIUmXMnmBEBxmBUuctkTyhAYSEgfZLPWtih+NvHZRoU0dY2ijYnakqcYmr4edrI5yDvqyQCqMkKIup1DZCGmCGB3cZWXfM8g0rFDDMCcebH68wIGTU3YtmL9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.101) smtp.rcpttodomain=amazon.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=GxhDhWo+zuu9Jb2jKlYN8O7BEJ1zmYitwA27xZNz6d4=; b=Spc3uUx+6fbqqFhDwYB32clSzAbVPeOxnwmTQh/vysXG1MX8A8ysSM2wxVGb7q4hqmgoeQ0CmF+Jk7dJjS6q2mPIE4PxPnB+lvmJE21wz9ZkmlicOnp0jfCSfAivk6VegqkUEG/rgNGbJFE3HJr43+4+DTIietlg8DYpx/gj3z5um59FArfFQTvLJR20YlOq4X3ZaVRbR5/l7U8KM2m1eD8Gub1H8W/SYgoCWbSRCMHbUzF6bsaPcXbLBJulkTH+QL4Armav2CsHqZCBqJP7UVsXpZfGBwzQN/E4lJxAMsgcWGkvLndRFNwxOL57bJoxw06Si+dUlDMqpVitpm4wOQ== Received: from DU2PR04CA0226.eurprd04.prod.outlook.com (2603:10a6:10:2b1::21) by AM9PR07MB7299.eurprd07.prod.outlook.com (2603:10a6:20b:2c6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.27; Sat, 21 Jun 2025 19:37:46 +0000 Received: from DU2PEPF00028CFF.eurprd03.prod.outlook.com (2603:10a6:10:2b1:cafe::73) by DU2PR04CA0226.outlook.office365.com (2603:10a6:10:2b1::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8857.27 via Frontend Transport; Sat, 21 Jun 2025 19:37:46 +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 DU2PEPF00028CFF.mail.protection.outlook.com (10.167.242.183) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8857.21 via Frontend Transport; Sat, 21 Jun 2025 19:37:46 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr712usmtp1.zeu.alcatel-lucent.com (Postfix) with ESMTP id 054C21C0010; Sat, 21 Jun 2025 22:37:44 +0300 (EEST) From: chia-yu.chang@nokia-bell-labs.com To: pabeni@redhat.com, edumazet@google.com, linux-doc@vger.kernel.org, corbet@lwn.net, horms@kernel.org, dsahern@kernel.org, kuniyu@amazon.com, bpf@vger.kernel.org, netdev@vger.kernel.org, dave.taht@gmail.com, jhs@mojatatu.com, kuba@kernel.org, stephen@networkplumber.org, xiyou.wangcong@gmail.com, jiri@resnulli.us, davem@davemloft.net, 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 v9 net-next 02/15] tcp: fast path functions later Date: Sat, 21 Jun 2025 21:37:24 +0200 Message-Id: <20250621193737.16593-3-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250621193737.16593-1-chia-yu.chang@nokia-bell-labs.com> References: <20250621193737.16593-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: DU2PEPF00028CFF:EE_|AM9PR07MB7299:EE_ X-MS-Office365-Filtering-Correlation-Id: 24dd53a0-bdea-46dc-5ac0-08ddb0fb1977 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|7416014|82310400026|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?tzWqBb7n+wTQEGvhH1TEp0nbx2QFzVs?= =?utf-8?q?DD5U/tyRSnbWjXbCaasX5emUKdj/qUccJUct/WLmC8NwaJe1ucNrxs7lMPGh/UNuD?= =?utf-8?q?ZE9MGraJliFU7JVAIpIqJBUrwZ6oeBiLU3ytvBpEq1UhySB55gJ5bjoJXIvOVjCsC?= =?utf-8?q?wqUipACPidbyyN89g7p1WQXStQatYHqRvrdNPaAemWhvjziG08dcs4WuEBrPu0M0Q?= =?utf-8?q?fRzplJstiHOMRV6dK+SUedN0LrB+EVXLLDTPHmP5kJFSyr9NDHMk6smA8cIOHDVYE?= =?utf-8?q?uQNKjQGNiyBAyH/csTgp5IQN/CuXDXMcYfKjqu8hOLb3IbKuRH6wRpEXsbt8Yv7va?= =?utf-8?q?L7uUATrb9rl0NY4VKeaK0SgXFvX3z9Dhljn+1DIXAIkBBfvoN93V6nh+Xb7Grqb/2?= =?utf-8?q?bGlWJX1+zWKt22ntTC4SXqfa9Y4cNjxUHbxl6YTYKHgO19AVkZwsOrOK1M4kgVqda?= =?utf-8?q?C34s/rsTMnQ3iiAI4RGsV8H29yZ/cG8cnOoVbojj3v5N7EOP3sPO+s29yY+5kn2rE?= =?utf-8?q?R1w9mMobqXCYHoH1u+uOUYV7lZj6+t4iMEg7MWelCzmF3zw4pTW1AEx+2pjNnpNuf?= =?utf-8?q?G+nPBDGUziNRiAw6xWIlOT+73pWmbOB1hb2SKyBsrvLDLBoZPF3wzPwsAGLffQUVn?= =?utf-8?q?Ulgz5lS0Xqj3LFtEDh/1M0AtbMk/ofCnZf37HiJS7RG01gx5Xmw5sYc+DgFTh08OW?= =?utf-8?q?1XjGfpo1EHlZMiFVJIPxqntKD0jF/8KEWK8Iua/4pkQ+yaJWXqmAo3Sw33oRNkVs/?= =?utf-8?q?TVOBw/4yE9PhXsbv9lV2Odc9dnwzC2B6FfjUdH5OlxXY27Kd4ysBdOjycj4CjJrZR?= =?utf-8?q?bbkwmSfSJzIg5CjA3e9/n1j8Xf5XNFCQN2/TXOZ9pi0Bev0xkvQ8PxVP8T2gVhrH1?= =?utf-8?q?goDNkrAAraUxj9wvjVcFN5EyRaClYuwBm1MoLjsZhcnfqqkrG5LbvBqajX/zBMV87?= =?utf-8?q?rok+vxLbH8hNdJm+tKZTBdoPZHYiOjsoyHVsE13zLZTVsrEY+5yGzzfqK0uGNiO80?= =?utf-8?q?lIsZ/Yn/DHpsFrFrzRJbkubW/oUj6rY8yK+o8ZKae6vv1vexfKK9n7tamuXi8VSAm?= =?utf-8?q?CQD2iMFPIMwCwEQ53/OxDCdJGgFM2B9GjU/wPjJ98XQHCe9SXN6R4GhJ6XL3I23Q4?= =?utf-8?q?gIVlxxDmar7kyDhCMRP1MR9OMc+H7rWu+QQshJ9uKAjA+5ac7btsZhmiFdSe7h5si?= =?utf-8?q?nzxVYLVZb8X0htoYmgF1A7oOAqpwDSuFv4oL6eqR/Kylwid8ONobMAxmr88TuccM8?= =?utf-8?q?n+m/w2Z3ohRMxF20w1fxH6f+W6ewxSVa3QubeFsdnrN+66B3EN5XFqtti+aAsPR5O?= =?utf-8?q?byfkLt9QSpoW8CBo0ukJ5rYhA1PmLE2xgy57Ba7NW2FfmEdalA8YwnPHdFLeGwUSn?= =?utf-8?q?niQRcqQ3DeNkbsKdB89we2gWNeItwS+n6RBpXyS+3tToIuTf2Y2OqaQ5ksQ+bjrAq?= =?utf-8?q?1L7qncCtbhh5wSRnKeDhclxbRRwbXyCA=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)(1800799024)(376014)(7416014)(82310400026)(36860700013)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2025 19:37:46.6221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24dd53a0-bdea-46dc-5ac0-08ddb0fb1977 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: DU2PEPF00028CFF.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB7299 From: Ilpo Järvinen The following patch will use tcp_ecn_mode_accecn(), TCP_ACCECN_CEP_INIT_OFFSET, TCP_ACCECN_CEP_ACE_MASK in __tcp_fast_path_on() to make new flag for AccECN. No functional changes. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- include/net/tcp.h | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 761c4a0ad386..ed01ae4be7a9 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -812,33 +812,6 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp) return usecs_to_jiffies((tp->srtt_us >> 3) + tp->rttvar_us); } -static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd) -{ - /* mptcp hooks are only on the slow path */ - if (sk_is_mptcp((struct sock *)tp)) - return; - - tp->pred_flags = htonl((tp->tcp_header_len << 26) | - ntohl(TCP_FLAG_ACK) | - snd_wnd); -} - -static inline void tcp_fast_path_on(struct tcp_sock *tp) -{ - __tcp_fast_path_on(tp, tp->snd_wnd >> tp->rx_opt.snd_wscale); -} - -static inline void tcp_fast_path_check(struct sock *sk) -{ - struct tcp_sock *tp = tcp_sk(sk); - - if (RB_EMPTY_ROOT(&tp->out_of_order_queue) && - tp->rcv_wnd && - atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf && - !tp->urg_data) - tcp_fast_path_on(tp); -} - u32 tcp_delack_max(const struct sock *sk); /* Compute the actual rto_min value */ @@ -1798,6 +1771,33 @@ static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt, return true; } +static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd) +{ + /* mptcp hooks are only on the slow path */ + if (sk_is_mptcp((struct sock *)tp)) + return; + + tp->pred_flags = htonl((tp->tcp_header_len << 26) | + ntohl(TCP_FLAG_ACK) | + snd_wnd); +} + +static inline void tcp_fast_path_on(struct tcp_sock *tp) +{ + __tcp_fast_path_on(tp, tp->snd_wnd >> tp->rx_opt.snd_wscale); +} + +static inline void tcp_fast_path_check(struct sock *sk) +{ + struct tcp_sock *tp = tcp_sk(sk); + + if (RB_EMPTY_ROOT(&tp->out_of_order_queue) && + tp->rcv_wnd && + atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf && + !tp->urg_data) + tcp_fast_path_on(tp); +} + bool tcp_oow_rate_limited(struct net *net, const struct sk_buff *skb, int mib_idx, u32 *last_oow_ack_time);