From patchwork Tue Mar 18 00:26:56 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: 14020090 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2040.outbound.protection.outlook.com [40.107.22.40]) (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 357481119A; Tue, 18 Mar 2025 00:27:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257671; cv=fail; b=YhhPhzxLv24mHL8qQO3beMuHKf43q2FpMU23moo0cGBk8+WXqEkwhJsz8ShXuL6oEBjStTT2DjY5IqBbXFEqO8fxWcVygQsLOYwxQbSjEF57f7FHt0Ns8FiiceH9CcJkY1X6b60NyS4G3ReORZWXvXeGtSMHj2aoPDUUg5vaK90= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742257671; c=relaxed/simple; bh=I/5cWdvN6eEd3lEuewEFqflav7KgszSP7X6bWuPgBpY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=dEX/LfF2jVqlfhaQ/SFpOHZfG2cn8NXqJGOfWyEnWQREWj8IY0df/3DotEZe5Pj4Fto3tsP3UyuigFFoKg7oBpRLgsqJuOUkLiKKfZgWL1K4CTzMvdKQKbgfKzQ7lDWD5pbCrplBns3PfYtj2lBa6Sn11OERJtB+kp4/2AYbHUs= 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=ccZQue5A; arc=fail smtp.client-ip=40.107.22.40 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="ccZQue5A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VYXETSbiZ6G2JrgClBZZoJd2203r/1ck0EimE4pQsJIWZwJwW7snHhwrMqQ2YUe7ut8wqNjAcLYIFDWOBYjIG0hGx85xo+RduNdSZnG5S/msgigHVePKNPpRF3UrLMXOxLosJXWmDBx9FuXb8HWAdXLJKkPDpXqWxJxG8OdplJkcdWtgq9/hrzMFgvt7uoawCI+XbYzBxfdPb2U6K2xEBxFKJVmHtSvIkP9k3fB6fG+KRETghRwuQp8vvQ8KCwVsxgU3CcAYL1iKAuDRm40OXXyz3lRDLMAbA3fj/nP8/uPiRiNhtxLAmn5+s49ee7Faxbgm/Ex4QtrdVZKy8kUtfQ== 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=qSmzk3vr/+lmZuoLWRV8sXEH2FYqAyZicyWsAkprjgs=; b=YV4QmFyWgAdSAqadQazctNz9N2aLE7q/jMh6dBOUImrFtYPxjEkuIXEIbRJlhEVxsowxoWoaiINQSN4ICNT8VRMgQIjoCzNf7ZgYyxBMdehTXL5Z0Duvji6LKffTbCxo8VluWpO7fBuE3kt1xdD7FdCpDKpp2TDVtzLgCRL3ux4TqvyvKRq9BHkxD3809yqXgskgMwyuDlCHMeS4+CGhvHFFxgR++iwycwfA31PsFJV+Q49W2RfLm8dQE5+eAXEjadCAaBqrkM25LVkODuENR55/YssPTRzanPh8Ccqy236htvs39hf0NTv4fGfGBLLSFHiBhSafJCi0o4e2V8gX2A== 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=qSmzk3vr/+lmZuoLWRV8sXEH2FYqAyZicyWsAkprjgs=; b=ccZQue5AcKWRo8ROl4RzoDOGBiKrDNdn/4rkgiKo9YlBnsDER9jHNey1pmrLy9+SWAes6+ksM5TOa3tB3/nwUOlTza+uGUjTUwFjBurisFnPeDlBzSQx+P+uzV7Uy1KBVUSk5Vz8em+wNz7wCpeKVckZ3DHNUbrroNlvsGaJA76GnlDq0Xvr33ZZzO2XcJ2GQDHzP2O+yw22u/YIf1FnbKGXBpGik4R2Uz4hucz7NxSK6DHCn795dS/yWOYco4VGhJVen0HaiqtZtY5rO5cb5X/u/62LJG89tTRGcATwsfcX1p/y9f993XhkTh7eWsqDX6z02vBHOOm5uPwnMNFqew== Received: from AM0PR04CA0069.eurprd04.prod.outlook.com (2603:10a6:208:1::46) by PR3PR07MB6633.eurprd07.prod.outlook.com (2603:10a6:102:6c::13) 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:27:46 +0000 Received: from AMS0EPF000001B7.eurprd05.prod.outlook.com (2603:10a6:208:1:cafe::7) by AM0PR04CA0069.outlook.office365.com (2603:10a6:208:1::46) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.34 via Frontend Transport; Tue, 18 Mar 2025 00:27:46 +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 AMS0EPF000001B7.mail.protection.outlook.com (10.167.16.171) 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:45 +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 52I0RNBh024935; Tue, 18 Mar 2025 00:27:53 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: Chai-Yu Chang Subject: [PATCH v2 net-next 01/15] tcp: fast path functions later Date: Tue, 18 Mar 2025 01:26:56 +0100 Message-Id: <20250318002710.29483-2-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: AMS0EPF000001B7:EE_|PR3PR07MB6633:EE_ X-MS-Office365-Filtering-Correlation-Id: 47772a8a-f667-448c-fec4-08dd65b3b494 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|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?WucxUQdj4mbywsqz/aLfuVkEf05ekDt?= =?utf-8?q?N/EIVSgVCiMIG7zLCtD5dBBGj/VTAdOlUsIwN6ybwfcZ4FfKIDaDGkUmfxsilclhN?= =?utf-8?q?fxko6YXaqDgUsCS1szzxXWPetyHRSNMHn57/e4VEgY6zJKdp4kOpVHyzyXwSIqWYf?= =?utf-8?q?g2sBrXp05ff87e+Vr4PjRrq5VgQyJt9bTepNDFbrtb2YiWFxajoTp7Ng6RRC/8hsc?= =?utf-8?q?JneTgF4yCq9BZHa5P8LXXyr3P0PLE76vJuJnu6LCb78bQeguBkmgwAB6Ox8ALg7rK?= =?utf-8?q?CBkyPfO4kFuSk8slkdXkJ2bP/Gl1YPwCOd/Iy/HJ703jZ3FwSqTcVSEvHTTazBFGX?= =?utf-8?q?mu3y/JmpoTpR1nhRVibBNVnTqJz72hOeWZJduLSHzhg5XZuIeNo8KlbOe33ZFbcRR?= =?utf-8?q?iErX8TS3LRXtv3WWbzCQYPmYoGRjNIHwHUynymekXdf7GbDPY2fMHKvmrAy8VcDZA?= =?utf-8?q?JzkYS5IagG58JFY8yQjiIG8mWEYe+lDoWWLjIRrmzNBA4qtjLwlHwlePKWBWU9Bnz?= =?utf-8?q?LZCn9CY6pauwQ7jfD1BnkBv6B9FXzgRnrJv7PFR031IT0KKqt9Id6JrQiZLxUCCuK?= =?utf-8?q?+XhsYmFAbI8ouFaHMEor03d4n0hWQRzP8t/pS0CbM8rpGnmROfsY/KNpaih6iXKnF?= =?utf-8?q?F8ZScBDmFMCO9fYMqy5XL7deamlxNh68uN8SzLVTXLKP0fZS+jtDCvh7gOkIEhYdj?= =?utf-8?q?sd1ahfM9gXgoeGMP0tqmcVjXSc5bE6Be191/Djb25SxJ4ZTytOXm05cXv9gU6JJks?= =?utf-8?q?T0hMcz9843YAIPDXUzDHlMotEemr0kHyhRN576uj94TkHn6nCN+F0W1wGk/W4PQOU?= =?utf-8?q?mfvCXNOr3nMsm46NMwJhYhqGIUZr+G1U4gZ+NjCDfIo5aWsKwLQ7si049c454hebg?= =?utf-8?q?Q6K0doAZhMY+P4b8xi2dcIVUu1hl3ADRBauowMfqd7oS+dFhhpgIjA/wwnud2NYss?= =?utf-8?q?LNmoFPqjmR7VN/kqrGGFb7eQkOp4hzMK+EppT2u++QpsyKZtW18Jak8zuJbbE2eM1?= =?utf-8?q?iYmU/8BsZdXMTn1o/qP75J5xM3QKt0p3MmTMNMc0OTnRNtT8OH5zAzbyqp/KxA9Hn?= =?utf-8?q?AwVWqwPfPR1BtxuLyzfFQtndTq1lQ09a/LmvxYi/dqOufaATTHEasWrLII0g2b3L8?= =?utf-8?q?o9cxP+USBunT1Wwm//WDYAPb1agoy5EqQWj33FLpgb278DgpyvaFFgcDNnp+D8TfW?= =?utf-8?q?FuQ9v2GM2wIe6X446be155b7eVO1djVvD0wI1dRo5Abu3yB/jNi2fHQLL5sXLdnpk?= =?utf-8?q?FuEfx1VzeYOKz8gVJQ0tS/OmIt3x5sS9O2WvCHaTxQ/LQqpYpAHCqGBBTB458awXZ?= =?utf-8?q?rFEtvIGcWad8QhUFqkOPUGvGEEBrhhw1VBGHPEF/+UVWRHkyD5q69DIS1rb7YAXkv?= =?utf-8?q?wmCW5boFpXVWoom2J42os94ZwmUijG6zrqSmqTiiUtNk3KthbgGxO4=3D?= 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)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 00:27:45.8911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47772a8a-f667-448c-fec4-08dd65b3b494 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: AMS0EPF000001B7.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB6633 X-Patchwork-Delegate: kuba@kernel.org 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: Chai-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 d08fbf90495d..830db65e5487 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -811,33 +811,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 */ @@ -1797,6 +1770,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);