From patchwork Wed Mar 5 22:38:45 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: 14003548 X-Patchwork-Delegate: kuba@kernel.org Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013025.outbound.protection.outlook.com [40.107.162.25]) (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 C0A932676DB; Wed, 5 Mar 2025 22:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214350; cv=fail; b=QlKMBacmnzKqDJeaKCIQ41P7rIhj6kdGaMEvGZ0FygnVvDnhPE6ONptkgmokvhi/6RYCtHFsxZCU4JGixfhtLCS8hhzeJ8qcOSFtUjVCch0po7eaQCgZsHehUbL+RxSAW1QCr7mS+NRvGrT4nxZxZ5nOx+BEmv+75PVJp+A+7L4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741214350; c=relaxed/simple; bh=HxJALqWnEF8Whxp0ZdFTJB3/DnjfC9ktgSbH3RujgEk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=gK8TlQ58syZTAhVXSM8w9CpPQeRejgMha+IFaWX216Dt8zgKxhE3CTU0VxsBau2yX+5nCmeMD7jgX/8n2/puUMQeEk5ikpI5Aiur+Hcr86mLsyo/qEQWRFERnVAYEbHYmi2Z4D30X0rWjFW4JIS05fSOMfXKBwpvwMX5dHH/j1U= 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=tO0jjRwM; arc=fail smtp.client-ip=40.107.162.25 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="tO0jjRwM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ba7JLjqAOGM+h9El2B2oKM6dsEKML54c/dKxFHKGFzB3zO98lqx0pNmxivcmO4FuQmEf6G3N7ualSUuuqxk62ByUNLbsqR9fInlJqjOu/52ZqDdqF969PaIVsA52DFTbDMxKf1y/an/iieuNA7EXbWwkPJ6004hkFfjAsHb56VzeghDBjU0Z//7FkcpmzQ7JkM6SSEYWuVrCoftcy+MB/BQCPT1aKttM9gNRVphqlSLlAkVKd5Bz3WBragq7BIS0AbeNXlB9GWN2Cb7OBfIYFS7yWbD2LgdDBqtfCDxTKmVxUJ9m1LJJuLigasK8hPLrM6nlAfehBzCAlTcLiEzYrA== 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=DTSh1SaQdAu7He1aPYFxG7DTSFXD9HAX4cddFz0FSPk=; b=EpghBvVppc7AkQwmXtdjHvFkmzh1hw93e5UybA0KGMaVKx9AcpJUvRUY+ewokw6WODoEkUKAVoFD1vkGKG9Z/AIGtqCkIdi/vK7V9IufFrWu/+8tNck7pftiCdbLD2wU6jTyxOcJIIBauZIyiiTbliKixve9MQsnqgAtX1NAc46qUmbCt1snUqNt31dQW9jTsTU116XgVEKyihu60hfUbeYaEaDPuNSbSXai3tFeYS/m6a5vfch9KgBcyJqEyvob+A4t8K8/xam/UBbxNEYj5ry5TUUEZJRa2ok9zbZE9n1HX5uy/Ey4kc0d8uOoFDN++dpxwedPb2qGWxfuKNY5Vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 131.228.2.20) smtp.rcpttodomain=amazon.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=DTSh1SaQdAu7He1aPYFxG7DTSFXD9HAX4cddFz0FSPk=; b=tO0jjRwMq7K0BvjTnV/X48lz6YuBtSY/D2MKpe8itxO+V3pJ7MnAIUiF+MibUVTDXZ/b1athOcLgJ4KK1tnA+zew6nbED6fUZ8KCvRYxPdzHsN5Rku3t4ek2ujU/dMv1klSjxfN+CxkeHH2sP91qODL3mDfanhwWB9w2yM4ZReytepz5wDNXnD4pP1G4exfwtaEIWwLKUC5Ats6u5a8IVGbfnFB4SzbLDfoTigewNxkViNoZnuesVBe5QAP5zUoPPWEQCWCyQuUvXHlaR9VnH23DV1XRnZJAr2dP93PSUD0quCRQgfLzVQftDT2p6Da+IEEM4l5+yjdt9ly72OuuGg== Received: from DU2PR04CA0241.eurprd04.prod.outlook.com (2603:10a6:10:28e::6) by PR3PR07MB8161.eurprd07.prod.outlook.com (2603:10a6:102:174::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Wed, 5 Mar 2025 22:39:04 +0000 Received: from DB1PEPF0003922F.eurprd03.prod.outlook.com (2603:10a6:10:28e:cafe::48) by DU2PR04CA0241.outlook.office365.com (2603:10a6:10:28e::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.17 via Frontend Transport; Wed, 5 Mar 2025 22:39:04 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 131.228.2.20) 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 fihe3nok0734.emea.nsn-net.net (131.228.2.20) by DB1PEPF0003922F.mail.protection.outlook.com (10.167.8.102) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Wed, 5 Mar 2025 22:39:02 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0734.emea.nsn-net.net (Postfix) with ESMTP id 6D7CB251E3; Thu, 6 Mar 2025 00:39:00 +0200 (EET) From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dsahern@gmail.com, davem@davemloft.net, edumazet@google.com, dsahern@kernel.org, pabeni@redhat.com, joel.granados@kernel.org, kuba@kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, pablo@netfilter.org, kadlec@netfilter.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, kory.maincent@bootlin.com, bpf@vger.kernel.org, kuniyu@amazon.com, andrew@lunn.ch, 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 05/12] tcp: reorganize SYN ECN code Date: Wed, 5 Mar 2025 23:38:45 +0100 Message-Id: <20250305223852.85839-6-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250305223852.85839-1-chia-yu.chang@nokia-bell-labs.com> References: <20250305223852.85839-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: DB1PEPF0003922F:EE_|PR3PR07MB8161:EE_ X-MS-Office365-Filtering-Correlation-Id: 8dbc1cfa-8c14-4e8e-2e2e-08dd5c36872f 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|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?7SUxldlQ2OFvGi5F4FA+UtqTcTlcDaD?= =?utf-8?q?QmiONvlvfoyB7NssusKz14zcyi13GuroaaVe1yrZ790/1IFw1GTQNbWAcSCRD2ok8?= =?utf-8?q?ixBwo5MfKr1E28yNV7d+U1l8kQaYhASvMvJK5euKpnmuijS8G3GdfptRcxcXKOxBu?= =?utf-8?q?/LpryVbsMMlMWifg/wmtaVnpBL+1mHLQiKJVh6Jd4DwEwV7OFdn21OhJyPpyVBMgM?= =?utf-8?q?F2Q/yHpoQSznxiEUUVEuPR8lsBvKA6TxgFUpOpCJj4vsXof4edSNGeJnOOcVWjidR?= =?utf-8?q?a7Pue8aKKeccfZeeOp2VIcqW31vll+ENh3YDQdFUNmWD3k8QvTyLGz/HeU718rdZh?= =?utf-8?q?7HmboR5dVr2AU7uD16jb2R9xNxg2zhTzUQ8wcGfcsnU64FEWxgoj98I/TIjY9l7+X?= =?utf-8?q?R0X9gurWzGAB3fLQiUctwijWU9jVx8Vrv0iIW4alExdlcDVGbuDRB/6mKt/LD4LKi?= =?utf-8?q?Gdf1dHGyQWfMmC5MUATgh0GSot4cRFI+0/GEY+eCdMdwvBwHZ5hJuO1tq/EovFW2p?= =?utf-8?q?RJW5YmGVOCg7HxTnPs7++lmtvcEg/pF6U1I810FNCxoL1nKV33Q0pPiwVLDiwXMPh?= =?utf-8?q?Q5RRzIZ1j1lzgTf+VeIciSWgjYBRZFM8D03roTYIHkAPnNgxqV+g6y+KKH7fGPpH1?= =?utf-8?q?m8ifg0l2zuoP/HmNPPDEyTLHQVqzzMjgSbwgjm3XlWIZJNZT6lKXTMJKat7yzgW2w?= =?utf-8?q?YEcNICGUVVJVaWhD8t56wu+o28V7ULWdgP/wRr3Ye1I7qsnGReEcm74G77TcWg90m?= =?utf-8?q?UZC9kkp9oqSQcOEUiCA+V1kz91Q/sk7ktTDm0LARj02zB+vF0852WpQpJerIda2r2?= =?utf-8?q?ll4AkzHVH0nOkT5l/HjRa9AG0wfniLc0OcjDe8f/DeLXdBgWvamzTMRaBSAyBftt/?= =?utf-8?q?SBnoInPyvgqN7LPaeMUIf+RMKD7piXMAf0cLxQBf/BkpfYP87rlYXpxXK82QsZUkF?= =?utf-8?q?7khEuKcXfJNmc+Mxn4N7iv31Kpe8q+8Lpm3YzmgNMCbfH7e3B5nBtnh5m/q9oFZxf?= =?utf-8?q?8Kc2aE2WyQQ7z33eHPpdvFMNBwXUqsQpaX/DAoctiG7Ddhf8orjXa1v8jp79sxJu9?= =?utf-8?q?3Yi+FQcemq3ahWNhdToE41IuBUGzX6kzVFYnDEHeYj5S2rOIwaheETNNIJyf/hix0?= =?utf-8?q?iULo+f9UYf83sHJOd1K41Q7Ga+2yn+e6ZJF8Nq201SF6FNaPBbt5R8LmlwfSE4PGz?= =?utf-8?q?B639Z2LJjkScvahplqYUE3MiOU8ShMQby5B9PKiUdjA/JKNVFhTTNpnYAXlQ0lB63?= =?utf-8?q?uufYJN82mXB05bbeOErMGZBrAYcZ92w1Qq/GD2SNkY3fuD3dKdJhtUI7pZ3oGrrG1?= =?utf-8?q?GKmkHjvh12LmdySrtnSJTwSZqxR6qTMzXPWL2Y+n6JUnwu+jbnVXjMKuj2mTkooAD?= =?utf-8?q?PG9EjczQcbnOTcREMZ07BvA2Y0nzGjhlzTO/uKOHMSjXgumUVpLEVBCqZzKMQgD+0?= =?utf-8?q?zMfOOa1ROX?= X-Forefront-Antispam-Report: CIP:131.228.2.20;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0734.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 22:39:02.1234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8dbc1cfa-8c14-4e8e-2e2e-08dd5c36872f 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.20];Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF0003922F.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB8161 X-Patchwork-Delegate: kuba@kernel.org 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 efd3cb5e1ded..98f2684e0006 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; - tp->ecn_flags = TCP_ECN_OK; if (tcp_ca_needs_ecn(sk) || bpf_needs_ecn) INET_ECN_xmit(sk); + + TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR; + tp->ecn_flags = TCP_ECN_OK; } }