From patchwork Wed May 14 13:56:28 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: 890052 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2053.outbound.protection.outlook.com [40.107.21.53]) (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 4EAFF27A465; Wed, 14 May 2025 13:56:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747231013; cv=fail; b=PuNXhI9LbhyusOK+/cZuQ53r6GCz4wI2Cq+TTZzOvJi9Xm4bHBbffkHkce3fCWMQpjgnFVo9nwP+pBI+aXN+ssMn0htmnsIFK1502wbI5+trPmhA1W6cdAS3rdY5maDOdJVKBiOd1FbCLSud3BbJZ57PuIo/53MRWPoSscnRiL4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747231013; c=relaxed/simple; bh=PYyCXUuKVKRWlC5fYTcacULQXbuy70otEK62ZKgXQqA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=IVFSM4wB9FN6qQy0UMpbXEojmONFy1CemD7kqy4jLYgBIVGoyXADaC/+qLcOgZfdh99UWac0zM7qvvBfz34HBJV78tPKQ+blN3+ADLblDxwPMCfqyKNCi8uYcdV1TqbcS7TOC56V9tiyYYy+MMqEjLJvbFWtAzNFTNJHycGGE6w= 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=rLgYvlLn; arc=fail smtp.client-ip=40.107.21.53 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="rLgYvlLn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=daTvxasa0sf9HwFuqPpibnN6CWWyCQSF4zexmwsrVZ+lNgFNxr1kGlNtu1CzKtiAhR/XRgjrOOxIf70p3Fdw1vTTAFclLtdrGT0RsGOLIPhBBzNSN/QfPHtiybKn9uN0sTqaMslaaE9NwUv2WtEZ91mFDnXJ+A9kQJyX6bSkG7xiPaphofWaETes6Jbo60sPNrjAYWRzYOWs5uOHzVUcgv5MnIHxr4su1BklqopezHhkogn4a4QUrATr3Frwo3tTbhjM2mQSTqLDKqiY9HGJ1pBAIdTMvVWd4917MU46yq1AK15aIrNx7GyuEpxeCRMY3bAI4BdPQYrWE/qLcn0I/g== 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=Jbp9mDaGjGTen8BidXf0OT4su1XnPFAKk8A8EBFXEZQ=; b=xl80tEDQYfOqbxA/EPgKeRufqqEJnV4mXN+yKUut6W+fjWxr5A9ZbVnr9rdyCkygX3+YRTbXQXktlYcRSmEB7lVEpJTBQtkiYR7V+oDr2/J7lA11tIZJBe5o5ebdhXy7TGQTw/DUEsCqnBRy2iXWQHZ2bXBT4D1qKkBu+ZHxeTFpMKwqa/mDzXAmBQyBFKoHXRYx1k81mwWFv6ZW/8e44auox+QjWGUlcxxxSAXgnUMAzL3Mgk2t5IZsWb90koskKvcwFBDDLkF/G+eNmh9Z0SpvmlEjKUJCkpOKXOyJxiB6MQAIg+Qk4rrKA9yaRkP9nCvZi3vZhFH/aY5ebHqWyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.240) 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=Jbp9mDaGjGTen8BidXf0OT4su1XnPFAKk8A8EBFXEZQ=; b=rLgYvlLnxG06HInm4/CI3yhhgmB3uL6/U+xBjuYMCqOu/uRatC1Rh8j+GSzv4O9Ku8/xbi6ueVT8CSID3Rnb4I2aiZaPaBL1TGudXYc8YyC7ObJUagTiJYT7KPdvRV12IVH57FL7YqpIrnrErKR3PQLxTcqrVo2RnZwG/BLUb5+DwWjATiBu61FKAHWkFyrcRc0DHtcJqghX/dKaPva/YqugAX3DvuwYA0Ne8HmU9i/0702W6TQEWFCZSqSjrcNjw5zz1iV7ae4onw2MbTnnCXPlMBO5uuoC0SzmToxCYtQKEJMTsAePTBmHFXmU39Zwq2w8v4O/qiGXnu1zKAPc5A== Received: from DU7P194CA0010.EURP194.PROD.OUTLOOK.COM (2603:10a6:10:553::13) by DB8PR07MB6394.eurprd07.prod.outlook.com (2603:10a6:10:13b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.30; Wed, 14 May 2025 13:56:47 +0000 Received: from DU2PEPF00028CFD.eurprd03.prod.outlook.com (2603:10a6:10:553:cafe::90) by DU7P194CA0010.outlook.office365.com (2603:10a6:10:553::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.17 via Frontend Transport; Wed, 14 May 2025 13:56:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.240) 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.2.240 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.240; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.240) by DU2PEPF00028CFD.mail.protection.outlook.com (10.167.242.181) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.18 via Frontend Transport; Wed, 14 May 2025 13:56:47 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0735.emea.nsn-net.net (Postfix) with ESMTP id 339822009B; Wed, 14 May 2025 16:56:46 +0300 (EEST) From: chia-yu.chang@nokia-bell-labs.com To: 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, 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, 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 v7 net-next 01/15] tcp: reorganize SYN ECN code Date: Wed, 14 May 2025 15:56:28 +0200 Message-Id: <20250514135642.11203-2-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250514135642.11203-1-chia-yu.chang@nokia-bell-labs.com> References: <20250514135642.11203-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: DU2PEPF00028CFD:EE_|DB8PR07MB6394:EE_ X-MS-Office365-Filtering-Correlation-Id: 46520629-f505-4ae8-942d-08dd92ef2b5b 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|1800799024|36860700013|82310400026|376014|7416014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?lTZNjFn9ZxlGzwis7lZFYMan5E5Dk3x?= =?utf-8?q?Ig6+CEQtQWz1x4Xs7AIv4AKAO/JbSQQbkHg3ra4fryOFxDbd1JKLXXgBSdx8a4vjF?= =?utf-8?q?iHxmM36MPr1oubr8zW+NPyqvu45aLuUQTCGg3wITmN5QfrBo10rUqwxg41KVkPiQ1?= =?utf-8?q?h0r0GKxV+wsTkVO1he+WhFCH1C7fStolKzXbu4w7oj23VOrkZRnvuK+nBi5H/AqF9?= =?utf-8?q?oHNtpvup6+gQ4hv0weTKsYYkJwbzYypCYk29kTW/8deR/t1zGWH2ONuAfOXourXH7?= =?utf-8?q?pq32d/ppP0Ox6TMc3b2Jt0kjZA5OrxodyQxZ07eXvGsBdXz/MOzCkmN7C1FYfa0GX?= =?utf-8?q?2JSnO+xIXqRc/owJ+OCM/OyFpLWt05BZgh7ZbDk34LSdKh4oWDLw/tdKRudeW10j6?= =?utf-8?q?+NZ9slj5PW64naIe6Evkg13aEgbIMXC+/3nDN/vRD2S8f7K9JqhPaB9wd3StdGP9X?= =?utf-8?q?GEO9CC12AYOAAyOjmwb7AEf6yFjOv36byy2VDhmrxn+XnlEGazTUUKza/xHTS3x69?= =?utf-8?q?WGyc+s5IbJCPj52xocCAGzVqsHzsuxWGG+/lsPSWFAj057yNLwcAgKY35/nEdgW4n?= =?utf-8?q?6K9DTWYbZOk78tHALMXgW3RUiRqYIkFD9ZTF572tsPptlSqdoBto72RUTUmQwA/At?= =?utf-8?q?w4Ap33/HnELX1RZd5t/hI7P89Aq/xRdGUylIP6B1SNaNp/I87nqF/nIgILqMCQzWG?= =?utf-8?q?bfsySoKObZKEySayv1tAEHNTzi1MZ+i71OTcDQGOrKqzfzNbVCNji9d5y7uvtPUEW?= =?utf-8?q?OQ1dwVVmU6A6i8+tCaQS+40DylIOHdl7SEhGW/U5FvP9d72UFyjKmY4Lhk8VuBWJ6?= =?utf-8?q?nTgtgov7vQoodJskUuyxyLANS6SrS+KUTxkJKOgBrt3ignKL4xooU0v/PJbWNeuZe?= =?utf-8?q?fT7JfwO0VwL/kNpNbTUdodIYWbOcdsrdT2duG8Y2ndiqQpQqelSvXhDfY792KEkCL?= =?utf-8?q?jWzDcsVQkDbwqHUyHo2U8jKhcONye2ALgZoPNceSIv5OK7o628ZrAbUoAqG9RvLMj?= =?utf-8?q?+M4WZNtSqp84ho0w7Q5M/194d+4tmZKAE09MX9cDwgPxZhIuBoEDVSebJAVR+/IX8?= =?utf-8?q?kBaF6uy4V5CkQwqB8Hec0ifSANR+QYOO/CrIymdT1L1UB9SvJxSEgueUuB4IH2sq4?= =?utf-8?q?RjMOEhPafYbZGt/1TIzeXT1pPbt7cI3LgRCUCEoJe8GLAlh2ufKAjD7rnEBMq7An/?= =?utf-8?q?nUyfNMtAAChFWsbpPRXbQi0kDwllGgZhLj2mm6llWKy2uVXPvGd9tAFhThDRbi+7s?= =?utf-8?q?DXdQiaF1kdyKx/XElAK+fBbgxxt5CPb/NoLtG3nSLoOlEe3X4UovsfMc/XBc5Ri7s?= =?utf-8?q?kXZ6bfDQkGpbv2Z/5S3xca89bH4ksMIrvK2vubKmbJsN2O2OfW5QicmKdEgs8Z08D?= =?utf-8?q?ZaGL589XSp1004ka2Pfbpns0glpyeM01sLzDDkaABrC6ngRnm5BFoKqWY+47er2jf?= =?utf-8?q?58a4kqReSKd1X8a7rYHUH8zbYGH0cSGw=3D=3D?= X-Forefront-Antispam-Report: CIP:131.228.2.240; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0735.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014)(7416014)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2025 13:56:47.7937 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 46520629-f505-4ae8-942d-08dd92ef2b5b X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[fihe3nok0735.emea.nsn-net.net] 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: DB8PR07MB6394 From: Ilpo Järvinen Prepare for AccECN that needs to have access here on IP ECN field value which is only available after INET_ECN_xmit(). No functional changes. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- net/ipv4/tcp_output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 13295a59d22e..9a1ab946ff62 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -350,10 +350,11 @@ static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb) tp->ecn_flags = 0; if (use_ecn) { - TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR; - tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168); if (tcp_ca_needs_ecn(sk) || bpf_needs_ecn) INET_ECN_xmit(sk); + + TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR; + tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168); } }