From patchwork Mon Oct 21 21:59:09 2024 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: 13844722 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2078.outbound.protection.outlook.com [40.107.21.78]) (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 28B42202649; Mon, 21 Oct 2024 21:59:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547988; cv=fail; b=TxUI5YkHapS/gyhnoTcVbx0wwVpm6mlIyisn6Hl2aeEX7gJl8cwwDjhSY+iHp7mmYwm1rHgOKx5o90y01MozJvn8iehAgCM+qV8SMSg4GzeNgNdORKSl/8Zk33LjmVk6YvivSQnY8nITIrq1ZiqZHZbXP/MvVf7Z3IHolCbAhl4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729547988; c=relaxed/simple; bh=InWE5VdTYS9XAJEJCLoyUYuoVX/6u3C5uYfgEWK3+zk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=uc+XZ/3D3+869nKcwt8FcNtnENL4Bfm/2MzwyawMuOzIZWa44rEPbaQtDI/oLF/d1VigEN509FiLpS6RDMaFh4TP/GCK/3LNWKj2zGoYlZXK0+ONUSH0UMeYAPxNX2+zsu12l+/ayU6uuhBlvs0w09rwv8l/GIk/PGywAM0chfY= 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=tILYPKtA; arc=fail smtp.client-ip=40.107.21.78 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="tILYPKtA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=asSQa+8d7FPJFisgMc8giGZb4zZojVXz44Vw0nHf0S19jYOGw6gnsr1XFEU8y3fqOrkpPEJ0SOxUwOdaO7mxWj4w2qT2wm9fm3wD3c+rq6Z35EbXQJ/JyRc9yG/o9TwjY7YGhQhVwf605R4wTE1bXFU7xs9DBVftPerkiG+8kVF52LY2FJllbVJSQ8OsywezAQUYeScm09vljYLZyDXxaPStBzjlpuv+jdrHED3kdgO2J759ZzLyF8dkrbHPJeOnPbIXPNbdinaxMb8qM7/kS9L4j2JO3jMGFzCW3A191YpkfdmlbC3rI18T07kBXFJnQU/HARiPaYQtoMP3q/1UUg== 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=KjtUDDwqSBTlN8GJJ93JAg7mvHQQiZNwgPW34th73Ss=; b=vx4REsqNhrUVUCImLt7gM/WboWx95h07FqA/fqgK/ETSj28eiQiR4VTcxJr0qA7JCNHgE5vhYDQDMX+Izj+3idn+VYPwH2ihDbCwSPu9i4ANG6o8IAwfTijJ1WZaGNcOvMON6ywoMIvP+GVoT5rkYF0vXG1WcXae3f1NoVx2/duTdgNTuYm8JUf+3yshBdMHh3zOvXS75okog8aJuv8Xey6tf5X68QG+MOgtjdvl9NlPpBTk8e5sWHSRdiuh+IGLjg2y54B6ozxDPV60XMt7dNBfEzfACBUDHwUQ7rtYvGQImF7dl3RlUmbt7zv2uNwwXAdtn34NkgtHmUxSh64SAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 131.228.6.101) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=temperror 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=KjtUDDwqSBTlN8GJJ93JAg7mvHQQiZNwgPW34th73Ss=; b=tILYPKtAvucywIigfWJhQWi0knIp2ymRtQCFyB0os45r9TYwe0AF+XmjwJ33IPH1Kzc0M2WhmUU1gr0pwfslrlppCSPxfPsLa07ZqpzyZ9dST3o4NqP68UZZldMBhjcrd7kTdWHBIFOxTOA6fk4fvUImk9puloemr7Fd9yty3wizjMq9q32rfG5pdO4WWdW/yJKwoZVTWsd1bRGlS23xXWXERFH+OtsI2djiIq5IsbCxu9Z5p7sBZW6DRu80lJFcEowf07/96AvUYiEiqiSRvya8p8WsXPWBg/73elBdx0p3Smb8b9qGQJXeuxJLo99DDRzHr4yQwIsDOvVbq6jjfA== Received: from MW3PR06CA0027.namprd06.prod.outlook.com (2603:10b6:303:2a::32) by AS8PR07MB9495.eurprd07.prod.outlook.com (2603:10a6:20b:633::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.27; Mon, 21 Oct 2024 21:59:42 +0000 Received: from DU2PEPF00028CFD.eurprd03.prod.outlook.com (2603:10b6:303:2a:cafe::a3) by MW3PR06CA0027.outlook.office365.com (2603:10b6:303:2a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28 via Frontend Transport; Mon, 21 Oct 2024 21:59:40 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 131.228.6.101) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=nokia-bell-labs.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nokia-bell-labs.com: DNS Timeout) Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by DU2PEPF00028CFD.mail.protection.outlook.com (10.167.242.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Mon, 21 Oct 2024 21:59:38 +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 49LLxENU032273; Mon, 21 Oct 2024 21:59:37 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, netfilter-devel@vger.kernel.org, kadlec@netfilter.org, coreteam@netfilter.org, pablo@netfilter.org, bpf@vger.kernel.org, joel.granados@kernel.org, linux-fsdevel@vger.kernel.org, kees@kernel.org, mcgrof@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 v4 net-next 13/14] tcp: fast path functions later Date: Mon, 21 Oct 2024 23:59:09 +0200 Message-Id: <20241021215910.59767-14-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021215910.59767-1-chia-yu.chang@nokia-bell-labs.com> References: <20241021215910.59767-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028CFD:EE_|AS8PR07MB9495:EE_ X-MS-Office365-Filtering-Correlation-Id: 56a863bb-d6f0-4260-1b21-08dcf21ba8e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|7416014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?fsqrAMsKdv+Vftdipz1UviktA9sl3x8?= =?utf-8?q?Utmu/igEn+cWq4hGZ2FbyujFFd6axfuLOLZTMovs+/GX42b274frVQeTJXRtifx0a?= =?utf-8?q?TY+NlXuEMyf5P3+r4fqmzVRKGCCVzmTc6FMggU+N7jT+ZTVctCwWk5R6gnqZR4gJD?= =?utf-8?q?Apit5ESVMWyAkjf1fNOtklugGkXIjo7oPwPoTttF2R8KALH1y3uIVnosBHcT+SCgy?= =?utf-8?q?UHSQcNAoHr22aJkw9dbeuKVI4BU00TqO3TPZEUfVcpBqUjudQ2kuah5D6BAM4JiC4?= =?utf-8?q?X/xX830DUES0fDiinXwlITmWcOEOqZcnHhL1Sk6TeumhYsX4IutcXaCLJaFE58rjx?= =?utf-8?q?NR8HGtqZw76Dv7q7Kog7UBtj19oqYH1cUUwhn4TlHXWvF6nZZ9lLvWUCK/lUU66Uv?= =?utf-8?q?oevnbvqQKuMdUw04Rp0qqRFT/dPwvs2jgbciY01rx8uSlpLkF5jHhDiNe7UnRDBpc?= =?utf-8?q?5tF6h4xgCKA3cXLhSzpU1nfWGNW6aK7HdD0mua2PpWgfVldr3ao2jpIW5eCB88yTB?= =?utf-8?q?Ls2mJE93MDw55yjuvuUF2NzXET9fwrC83tNLpMr+49F8p55gFoTxqwFzbT2GjYjL/?= =?utf-8?q?VGVQWGIuv82A49Do6RzROEzsVCa1yzHW1SNyonZTGfIUmNwc374K9ytB1pkUIrfjx?= =?utf-8?q?ys4UwH34PUgoY3bbn+Xzva7y2GQcXpkuyfIe5ksugkAjEY0QyBQ0Lt+HqzTYEyBMP?= =?utf-8?q?aZtvsOCdUy4udnZ1MF5wKSm7bt1kFMT9Uhox6CkvlK2jj6BFnsQ1UlcTdxYs2bJVX?= =?utf-8?q?ARCe+mlKPt1fmv9vVMJVBvRthpKF21hZSvwnHmgRMp0R2HkyHbWUVfTrzTpH1fGRJ?= =?utf-8?q?UQfRznxkPqDst+Qxr4PC4jgbWQYvNo+jvSAk66G778cQ975YpigqcrVh/PpMwLeEW?= =?utf-8?q?ipafbFRsHZOkfpuWV0qrHHkOM4zcj8EIZct8fSn9slLSXcyvB5haTJBt5qRkoxPmK?= =?utf-8?q?8jrFa4NpI2oL5uXqRbPO1lo+lamg4xzqMjNsww1kADBKm2kv6cm9iPhYILtLajZ7l?= =?utf-8?q?2kRyD+f6LO1ppkvmC9r8bv0Hzv0tEzDmcMuEs3o6ohv9IElD6vhIaZL6A15huzJt7?= =?utf-8?q?dbc0OI9341jGlWlixwBHAaYkrX2W2keBNh1eAmtDIBuywesCFE49gy1gk82hD+p9H?= =?utf-8?q?dmcMAHd0AyHQoE7sU9LJaVczileIF1gW0tS7zRxIj/V1WShfiC4JmEWOOgY6MFjJU?= =?utf-8?q?iwQ3l4cfKvK/Ym5pAMnp41iuy4zqX5OYvHSzu2EeHRlPT+DkUdDQK/V6JHcxOWKIS?= =?utf-8?q?BfveUhU0VSv65qf5GmFsFtxcLuIxfc/Cbh3Ki9/unvWd53SXotNYb8bSeeN2wRuRF?= =?utf-8?q?i/AEQ926e4WRFSuHzdb9FjcpBQbus0z9b2Apgg8P5v/XzH8P4RE+60A=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)(36860700013)(376014)(7416014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 21:59:38.9634 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56a863bb-d6f0-4260-1b21-08dcf21ba8e2 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: DU2PEPF00028CFD.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB9495 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 81efbe1195fc..6945541b5874 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -788,33 +788,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 */ @@ -1768,6 +1741,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);