From patchwork Tue Mar 4 15:15:59 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: 14000902 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) (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 8387B27F4CB; Tue, 4 Mar 2025 15:16:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101378; cv=fail; b=fnkWvuszhCmM4ygsdv0X6N29BkJjpvk3OVRuZ9nEWPmJgmYgoPKFNCwXnXmgz8mkz8GhQCH+FXZQ4zN/bAWCLVrmlqc1Z1uV7Y1A1wDsqJXOmeJ5MqCVObGj3ZmijP15LZs6XCbDz2sCXL2yJ7hyUFE3aCGINsB0vKVy4qo1VqU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101378; c=relaxed/simple; bh=caj/4dZuzxPyIKMdpBQhANNHF4/Fmzuo5IWAFNxKlEE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=jF50I+30iH2ZDK/WpNNDh3Adm9gi83gw6Tjg4IMG0CkSYrUgxd//5xp+MT2DNJvMrM3wWiG7y6xkObpcwcZ/szg74EMYN64cMO2JZcI+faxWoSE6N9/V7xNxyQlcPAtxRJQaP8tmhgxQwgtBrHTAKNh/6FqEw1Jvj7Bb9xc/FUs= 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=Pawegcrn; arc=fail smtp.client-ip=40.107.22.81 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="Pawegcrn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=erqyWukkmsFfmujbOimpjL00SYQnJBhpzc5vhM6OvVBoDAYsNEQoyYTejLnve19d0qn/MheHrIWmMbvB+48ycRCSP6uE+zqNVXkztsdyDDwdK/1TFSW7E3ZqZw4iktNFwalAP95gCYb86PzoGD0JfAx02krtDx0UmxMVgdLbnifSAFqCFrMHRIeIaw/ofRBlfJnLJCcA/sbXfSumpnwbAsXaxR+3XDqPnIY/eZUz5qoFQ7IY3LYHPamckBKs0E84AH8oBq1ruMFe3I07m5YVSv1UvgrRmmbRMsgmS9YtwpgxHg3eMVHAaTsA4+C1QCiyt6eOWIOllbPCaZiU88cROw== 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=uj6vrfMbkSm7IE+wBlr7CsgyhJJxRVGy//VrJ27K02k=; b=LzAmWF1bg/TcKB+zohbVxl2WUBZwmz8V5NiFVL8lhtuC+dOPBFs3bg5VgjJlQ1ChWRPXtDTFJICMlU+OJCuRmCoSWUiMsiVrcWx6C6Zj5DrhIZI24Ai5CozH/PricIt9S/+LxHnkPghUBZOUX0OGQNlmj+wvMul8wRBp5jHkLVyv1GCvH32cC+y4hhFqVMwDcu9AMi4JkmeHXkrHsp0ySm1UNEhSng1dw085nvbGa1w0jiqosHWyusUvRrwmhh9T7BCjakPwa3iLbYANtt2oO+W/dW71xIBrPp3kjtxYriBlNMYxjskNR9WRiOH0XYRYSGSM4RNkrEDzjRVKNOQKnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=uj6vrfMbkSm7IE+wBlr7CsgyhJJxRVGy//VrJ27K02k=; b=Pawegcrn1PQK+JZ/o66QbfaXhjknkTUGx/VdAGFN+fZRQQbaWBj9A/ut/0phT5aFmoMCHqfTVc0ZzE0ieT2/lZFy4XvPx6rSe6EYaOdd8lgGdY6f7PgQZhNh4QaoojMTLvht2xsuhTMmHK33+jErNtqPD7srVmrDxlt2UcNcc2GdBDoplmKg3NkeFzlUB2r9kG6PNCu0ESNBy+YkFpoEcwwF7u2EzudvSOk4cP1C8RFAwJUkjZlL4iihIZqbMfyzfqMZmKWBcpTAuBVY7k5rPVn361Yd4bMMAJulohGPb+muB4yzQJSG2nw6EouCfRDnxUiTfd9cLZ5scv9jit4iCA== Received: from DU2P251CA0005.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:230::34) by PA4PR07MB8576.eurprd07.prod.outlook.com (2603:10a6:102:26e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.29; Tue, 4 Mar 2025 15:16:13 +0000 Received: from DU6PEPF0000A7DE.eurprd02.prod.outlook.com (2603:10a6:10:230:cafe::d) by DU2P251CA0005.outlook.office365.com (2603:10a6:10:230::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Tue, 4 Mar 2025 15:16:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by DU6PEPF0000A7DE.mail.protection.outlook.com (10.167.8.38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:12 +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 3D58424F98; Tue, 4 Mar 2025 17:16:11 +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 01/12] tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() Date: Tue, 4 Mar 2025 16:15:59 +0100 Message-Id: <20250304151607.77950-2-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: DU6PEPF0000A7DE:EE_|PA4PR07MB8576:EE_ X-MS-Office365-Filtering-Correlation-Id: 8356b366-99ba-4e6e-6d27-08dd5b2f8050 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?6OnhHJOmAPuEOAfceP+Lrg7LRyFIIQY?= =?utf-8?q?qj7M4kWKeK8gReeK8PIu61yWWMAx9brSWizTiG8zrmJBFIJrNKViOi4Gski4nCWVs?= =?utf-8?q?8vTqrH6uR2n5ENb4/3Zym46IS+Zz1VNS320auE2lX/C6YwN5tB+TOa+g2Vh5ClVXV?= =?utf-8?q?rzSeHCFiuWwL9/p4u5S8367V7MP9ILyFDhm2KW0rGQrLNwiEPdBVVI0Hr5z3YsVM+?= =?utf-8?q?M2VYIiRX4HS+86c3QMTfrgaFH7tgVVfxTcgO6g8/rnQAB55YpXqW24sxaS7Ngk744?= =?utf-8?q?qe5WkPhuwc4pM0L2WWYP2a7PJbXAtUHFSaNsUBU2IBKKbKCaAHRWyh+tDbIx5a0Sb?= =?utf-8?q?nCLRAJk/nz1e8S3DokCNt8IENhi/31R5Gcocfu4AlElcpMRFxobqbarmtzqRyqXVD?= =?utf-8?q?BQMc8Gup6DK5U6owWhxuTvvPQsWhjQU+lVYAYYhkLerctS7dhDDt2NCwIJiB6iyHj?= =?utf-8?q?vukM6IuwJJlbUyI43owEQcegi0QfmYxRYW50KIfKUrhDu+GrAP+kJwhLFDEeQ23JN?= =?utf-8?q?5EudTMwaAom5RC2gTt19Jct7LdTrpTM8lqMqFwhWTkZoA5Au/df9kv8ybogUlsESi?= =?utf-8?q?9hm6hIZTlZu+neAdXlylDuZfx90GnZTcFuHh9W5p+MOCX7e44TGDKUtnk6KAv11/r?= =?utf-8?q?4sjfMNbu1Ohnq+sNYV43/6wZbr9wtxsqJSwNG3GEvGCN2HZWrfnyJIUHJbxdYuHV3?= =?utf-8?q?ed0pSlPERApbhsk8xtvvX3oA2es6tMvFzCGsVT0DYjawyF8RAH4SDjPKqSdk/0Yzi?= =?utf-8?q?1f5kfYLnz0Kv4CgQgfpdibW4juJM536j1ZB7B4NXCu7EDwffwBJYR43uFEdWdwfXV?= =?utf-8?q?aJJw/nMF+gDXq/rgAPs2HSatSV3qvchsu/eE/6zG7Zme1v2AF7Q4GxAVtaYMSUhN+?= =?utf-8?q?qbce8T/Eol8+rSH3ykDjFYdZAfiIfiH52QInA5XU3zXg8JxvX14htXJFUmThOAqi/?= =?utf-8?q?2VEPBVXgqwB9RZa994iAD5xojZRoe04LODb2NUxN2nmiSFLeYmdmRy1Y+34ZlQBFw?= =?utf-8?q?scmCchWdj2bmlC+x+T7TAjCoPXAjo5czaFFjiJ6Qpm95cleZqnV3X3eS+482RPd54?= =?utf-8?q?BuO/zQfo+ePOQsTMTj6ARQlLa5ZLq5nlPQgnZAeJbvOwfiK/UkKguUUhUhyAnrhaH?= =?utf-8?q?Z1UYs6b1NWOWEIVWAdYjctwf3noXG8Qu3ZavFB84UF2VMXD+nBSA1N31iXSs5qZYZ?= =?utf-8?q?D1Q4ABylim6d2WVJHjjzQ3WBsjp/MyIdzcBOYWDEsHIZGqfit5K/lBk91Dc98NIk1?= =?utf-8?q?GGNhRsjQlESVSo6YWxJTXb8R1sxgnOgL/wfvJL1jSUYS4/2z7ayIjiM+PfYJZv2jw?= =?utf-8?q?NrvvnZCu0/MOkc5RduLIij2wqd8zgMqTmqm+nzqbX5p95McRMooQURNB+nKIIeNyu?= =?utf-8?q?SZtn/W3EpkdzAPpuTwa9nqTFkMmkE1yaw530VP2QHn9uPGbFp0LwNM62+R66j3zbI?= =?utf-8?q?G7PSlluryC?= X-Forefront-Antispam-Report: CIP:131.228.2.29;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)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:12.9573 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8356b366-99ba-4e6e-6d27-08dd5b2f8050 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF0000A7DE.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR07MB8576 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen - Move tcp_count_delivered() earlier and split tcp_count_delivered_ce() out of it - Move tcp_in_ack_event() later - While at it, remove the inline from tcp_in_ack_event() and let the compiler to decide Accurate ECN's heuristics does not know if there is going to be ACE field based CE counter increase or not until after rtx queue has been processed. Only then the number of ACKed bytes/pkts is available. As CE or not affects presence of FLAG_ECE, that information for tcp_in_ack_event is not yet available in the old location of the call to tcp_in_ack_event(). Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_input.c | 56 +++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 4e2212348088..6a8eca916580 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -421,6 +421,20 @@ static bool tcp_ecn_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr return false; } +static void tcp_count_delivered_ce(struct tcp_sock *tp, u32 ecn_count) +{ + tp->delivered_ce += ecn_count; +} + +/* Updates the delivered and delivered_ce counts */ +static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered, + bool ece_ack) +{ + tp->delivered += delivered; + if (ece_ack) + tcp_count_delivered_ce(tp, delivered); +} + /* Buffer size and advertised window tuning. * * 1. Tuning sk->sk_sndbuf, when connection enters established state. @@ -1156,15 +1170,6 @@ void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) } } -/* Updates the delivered and delivered_ce counts */ -static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered, - bool ece_ack) -{ - tp->delivered += delivered; - if (ece_ack) - tp->delivered_ce += delivered; -} - /* This procedure tags the retransmission queue when SACKs arrive. * * We have three tag bits: SACKED(S), RETRANS(R) and LOST(L). @@ -3864,12 +3869,23 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag) } } -static inline void tcp_in_ack_event(struct sock *sk, u32 flags) +static void tcp_in_ack_event(struct sock *sk, int flag) { const struct inet_connection_sock *icsk = inet_csk(sk); - if (icsk->icsk_ca_ops->in_ack_event) - icsk->icsk_ca_ops->in_ack_event(sk, flags); + if (icsk->icsk_ca_ops->in_ack_event) { + u32 ack_ev_flags = 0; + + if (flag & FLAG_WIN_UPDATE) + ack_ev_flags |= CA_ACK_WIN_UPDATE; + if (flag & FLAG_SLOWPATH) { + ack_ev_flags |= CA_ACK_SLOWPATH; + if (flag & FLAG_ECE) + ack_ev_flags |= CA_ACK_ECE; + } + + icsk->icsk_ca_ops->in_ack_event(sk, ack_ev_flags); + } } /* Congestion control has updated the cwnd already. So if we're in @@ -3986,12 +4002,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_snd_una_update(tp, ack); flag |= FLAG_WIN_UPDATE; - tcp_in_ack_event(sk, CA_ACK_WIN_UPDATE); - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPHPACKS); } else { - u32 ack_ev_flags = CA_ACK_SLOWPATH; - if (ack_seq != TCP_SKB_CB(skb)->end_seq) flag |= FLAG_DATA; else @@ -4003,19 +4015,12 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una, &sack_state); - if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) { + if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) flag |= FLAG_ECE; - ack_ev_flags |= CA_ACK_ECE; - } if (sack_state.sack_delivered) tcp_count_delivered(tp, sack_state.sack_delivered, flag & FLAG_ECE); - - if (flag & FLAG_WIN_UPDATE) - ack_ev_flags |= CA_ACK_WIN_UPDATE; - - tcp_in_ack_event(sk, ack_ev_flags); } /* This is a deviation from RFC3168 since it states that: @@ -4042,6 +4047,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_rack_update_reo_wnd(sk, &rs); + tcp_in_ack_event(sk, flag); + if (tp->tlp_high_seq) tcp_process_tlp_ack(sk, ack, flag); @@ -4073,6 +4080,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) return 1; no_queue: + tcp_in_ack_event(sk, flag); /* If data was DSACKed, see if we can undo a cwnd reduction. */ if (flag & FLAG_DSACKING_ACK) { tcp_fastretrans_alert(sk, prior_snd_una, num_dupack, &flag, From patchwork Tue Mar 4 15:16:00 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: 14000905 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2062.outbound.protection.outlook.com [40.107.103.62]) (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 B8E4A284B43; Tue, 4 Mar 2025 15:16:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101381; cv=fail; b=uZ4HOh3+x6p5fSHP5gsPzi498uTXtaWpxVvIHf9/amDbVy/H38nmuU3Jez6opn0BYyvAHB+0E6CPFOgSSFEA3HR6n1emm3GPLL9PiqUKZKkpyMw4yEaUveBGVPZDP2Gf4XB3qIgmv3dO4DBoe5BcmmuY8k26t9HuNLQi/1W7F6g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101381; c=relaxed/simple; bh=+ARu58x8s13+TcFCn58qW5AlwIEfzHsxB3c3plCyDaI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=AqnbW4WegwiDQ1HxGOkiUou56Xto2X3bP7IRUqzPcgYFrjjSAgW+SJLSGhAy/2woVIj+FNh5rUOub09mVxYhpnI2njdKX6BQBGz9VnG0EwAAolT3iAG1/dP2UYh/3jQqFLCuv+For1HMAJcYG9TWjybxngaidZk3QltRygHgwTw= 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=VyCDqo+7; arc=fail smtp.client-ip=40.107.103.62 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="VyCDqo+7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oKrPt7L7yLn43uPaxqRiFcfDjyenCe/5dCniKfX3c1fW5x3z+qNjj2dO0jbBW627PylKbgeZpVaKxPG2w4xeQl+FV8w/lnsapCciw0eRxxd+6f2sw8sA253g+hmZ58GfEV41K0iRlgXLNFtP/xjfCPWVDkPKWAFBJ0etxBuKfxT3EZl7q/JLxR+2T3+0fAgIJQwiYDEgcsYfBuG/s/LATQMVrjP7Nk4F8SXah71VT1cYC5OkF/9RLadDN2i9bHp01cEmrDvhQIzVceXEMoPJ+1BCZzo1KMp3wuEMol6I+M4ypOQz1qhqbmNlqAK2dPpACkoy4kPE+WCOC/PUEhEKjg== 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=6P7pGyCPHjKrPFWpZP9X6L+e4wDkYsQD65Q6r5MyWLw=; b=qMw6TwxgpcdKZq+RGU/OZvTEOpkgZE0tdVNq/H10OaiwGMMhStGX6yOi+3tEBX/qfGDXeSGSbZS4d6iTbcoT6J9OZs1K2r5KW+R4POTDqhvlK7eesMMDCkCCWfZbVoiq4u/hV1LzUJlpr8l/CZ+nH7knFkr+ADRZuCMs393zyhDSCCiK2Ce4tdIIxdUstZaYeDmc8g5/7hok3jStw7P/ZU1cqIGO2PMBNW64tX4ptd9FTO1YA7ZC8ybufgQoPaQ6hwBBI0PLaQP3dRV1yM5d4/0u6twvc17n4DwY9x3MBlND1tOS53euJMrCJeGqsvnR5Wt9LC7GAiHbhLJZHQdCMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=6P7pGyCPHjKrPFWpZP9X6L+e4wDkYsQD65Q6r5MyWLw=; b=VyCDqo+7qIXNmReb/crr1X/jLId3ODQ0+c6xtgYqMA72gfvSeBhiT7fJ0Je/n9f2yd7gCm9P2sc6Bsob2PplO7JPDmMNYA0W9eY3uTg744CF7Jhefo6D9hx8TOLE8xoFrmi2TAQBX0GRsGNw/xIsZXQ5n0WOQbATsvu9PuRhI27wc/tiZdAG6FKAfUxT62+lwoIOn5AngT5DEXcVVfRRR7DUFOfYsnufZswemykI2ESHoMRQxfonWX6toVOcWOtLBO3uVCWosmeKnXbsTik77kVWTbwDrCmfM4t0A5CKLQLY21B8DHt9zb829poCnpS8VBf7gQfRBvp4CWcG2pY4xA== Received: from AM9P193CA0021.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::26) by AS8PR07MB9474.eurprd07.prod.outlook.com (2603:10a6:20b:633::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 15:16:14 +0000 Received: from AM2PEPF0001C715.eurprd05.prod.outlook.com (2603:10a6:20b:21e:cafe::7d) by AM9P193CA0021.outlook.office365.com (2603:10a6:20b:21e::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.29 via Frontend Transport; Tue, 4 Mar 2025 15:16:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM2PEPF0001C715.mail.protection.outlook.com (10.167.16.185) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:14 +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 8CCFE24DA2; Tue, 4 Mar 2025 17:16:12 +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 02/12] tcp: create FLAG_TS_PROGRESS Date: Tue, 4 Mar 2025 16:16:00 +0100 Message-Id: <20250304151607.77950-3-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM2PEPF0001C715:EE_|AS8PR07MB9474:EE_ X-MS-Office365-Filtering-Correlation-Id: 14fa8b29-5c8e-42c4-3de6-08dd5b2f8100 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|376014|7416014|36860700013|1800799024|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?x8EQLoROMuCdqWocWDIGgLv4ddTviCM?= =?utf-8?q?P2bitmU3GDtzaPIaMeg6ZwCmXE561j6OjsyxvhGmPYwUaL3mYYECSuGNVktQpUuAq?= =?utf-8?q?RPodPfd1GjCF2geBgmMjZ4sbm8ij6UhIcK7+g9BNnjzwSKRquHbSfKgCm9LYfliwp?= =?utf-8?q?5nwO5LhiKvyjZmqhCVTjaxd/yWwS28uP06rzO+CguSE+oNZPLGeX8y3mxJzgJ2Xfm?= =?utf-8?q?b49e/daqDlpLqXEbwrz1rZPs86m9NycwPUDdYJfNDNguv94JLdVT9fauDxRw7lZNT?= =?utf-8?q?/3y0/xXIA3O/uDiYfLChf1v//CVFnP7pSXcqgMx7Q5X7nOzlTnz8K2uzyB7nRo6oL?= =?utf-8?q?UITwesDFWiikdT9WWKACBbCHI5Yji1A9He+HvsueToIXxs2B0Dv4FYLpWtG+ys5Pe?= =?utf-8?q?/fIV2ptTO/EdotP4ml12KMWZieGYOwgSJTIzqcCkIMJw+Md6ULaTlVWJsvF6tjxrh?= =?utf-8?q?VxeDcWMHlJd8yD/8XR1LM7/YwqodfR0mZV4krG0SaP3sUJ9d+bQY2p/zEv00HNXjb?= =?utf-8?q?gc+LemtcTGs0nVY9/tnvcvz8cM2HQT6PX6mH+O28Aaj/+IY6zaTrjW9JJsy8CgoCr?= =?utf-8?q?HY8E4CMn2XVI6MFCMh+JpF8uzPaRRw4qCtspzpYeNcivkCanJIrVJLR9LZNtkszt+?= =?utf-8?q?InGwVYkPsNcwreqocG5vZWSA/RFNOum6AwyPmfrxiuUh1VIHts8QNd03elgxNApGf?= =?utf-8?q?rF7uz4X0Yt9jpF4AEl+hCF52qbIrILwq9EOvM+AChJFc/EMr1fWvl9Xii5/DtDbti?= =?utf-8?q?Gv7012ekEYWM4356NB8hBX2+35v2wDAR9g6jJBvUprYRPFkWzJIAIMv5wO0mXhEQT?= =?utf-8?q?afpZbG2f42metrEetnfnWkdLN/9xV3VN+Iu52WhxqplbxGDpojHUhLTyyuWGZUDGd?= =?utf-8?q?+/AWDyMNlIj+rleDlrZgBcI7RsxLV/qsnBjWqXO+O/v4Xj5dpNHboCt1l8gisZoCj?= =?utf-8?q?dPFfQMlv+B/8ttAJBSV3zwVSSFh0UjKnU+hizwJp95SHCFQu1MMQuYGnzijEFhykx?= =?utf-8?q?ORfVNtyqObYl53v0vZ3k4dENK34GTN9q0mIiO1K1yHSr6Zklfq+DaQRC9LeRX9Ed/?= =?utf-8?q?WdEy0p8TctqnyPQfekdxB9dlrI0//1n20cxMJXiQJNiOoYNVKOrXbcsk+jWrz6Xg/?= =?utf-8?q?6GRQEZUsgkZWTl9BkT4jtrdg9W3nSRtikH5PBNhhR1urEXBbdG+ALMPaYx5UwWHfQ?= =?utf-8?q?8g6+j4vPylEPZtfSib/sxMFmJy0Jmd7QLdXoLCVEbsgi/rNnl6BAQ1bq4yL3z0E4H?= =?utf-8?q?Xq2c12RnUZO8pjJOm5zsfa88UZ1tlhYDUv66pJa0JixgXUsUeuwZdUA/2jIbsntai?= =?utf-8?q?584/SWTCXJDz4ukBatrowo5Z/jLU1RhhsCb/EOKRT0ZTi/jphgDogLCo1UFMR4tUk?= =?utf-8?q?Tz9Tcyddl3P3Ijk5d8X0JV8Vy2WW7Q9+qjz5nT0H9PaEDWxDCSvWozN50OSwwY3Qs?= =?utf-8?q?PWnzgPEc4m?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(1800799024)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:14.1564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14fa8b29-5c8e-42c4-3de6-08dd5b2f8100 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C715.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB9474 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Whenever timestamp advances, it declares progress which can be used by the other parts of the stack to decide that the ACK is the most recent one seen so far. AccECN will use this flag when deciding whether to use the ACK to update AccECN state or not. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- net/ipv4/tcp_input.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 6a8eca916580..771e075d457d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -102,6 +102,7 @@ int sysctl_tcp_max_orphans __read_mostly = NR_FILE; #define FLAG_NO_CHALLENGE_ACK 0x8000 /* do not call tcp_send_challenge_ack() */ #define FLAG_ACK_MAYBE_DELAYED 0x10000 /* Likely a delayed ACK */ #define FLAG_DSACK_TLP 0x20000 /* DSACK for tail loss probe */ +#define FLAG_TS_PROGRESS 0x40000 /* Positive timestamp delta */ #define FLAG_ACKED (FLAG_DATA_ACKED|FLAG_SYN_ACKED) #define FLAG_NOT_DUP (FLAG_DATA|FLAG_WIN_UPDATE|FLAG_ACKED) @@ -3821,8 +3822,16 @@ static void tcp_store_ts_recent(struct tcp_sock *tp) tp->rx_opt.ts_recent_stamp = ktime_get_seconds(); } -static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) +static int __tcp_replace_ts_recent(struct tcp_sock *tp, s32 tstamp_delta) { + tcp_store_ts_recent(tp); + return tstamp_delta > 0 ? FLAG_TS_PROGRESS : 0; +} + +static int tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) +{ + s32 delta; + if (tp->rx_opt.saw_tstamp && !after(seq, tp->rcv_wup)) { /* PAWS bug workaround wrt. ACK frames, the PAWS discard * extra check below makes sure this can only happen @@ -3831,9 +3840,13 @@ static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) * Not only, also it occurs for expired timestamps. */ - if (tcp_paws_check(&tp->rx_opt, 0)) - tcp_store_ts_recent(tp); + if (tcp_paws_check(&tp->rx_opt, 0)) { + delta = tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent; + return __tcp_replace_ts_recent(tp, delta); + } } + + return 0; } /* This routine deals with acks during a TLP episode and ends an episode by @@ -3990,7 +4003,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) * is in window. */ if (flag & FLAG_UPDATE_TS_RECENT) - tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq); + flag |= tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq); if ((flag & (FLAG_SLOWPATH | FLAG_SND_UNA_ADVANCED)) == FLAG_SND_UNA_ADVANCED) { @@ -6165,6 +6178,8 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) TCP_SKB_CB(skb)->seq == tp->rcv_nxt && !after(TCP_SKB_CB(skb)->ack_seq, tp->snd_nxt)) { int tcp_header_len = tp->tcp_header_len; + s32 delta = 0; + int flag = 0; /* Timestamp header prediction: tcp_header_len * is automatically equal to th->doff*4 due to pred_flags @@ -6177,8 +6192,10 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) if (!tcp_parse_aligned_timestamp(tp, th)) goto slow_path; + delta = tp->rx_opt.rcv_tsval - + tp->rx_opt.ts_recent; /* If PAWS failed, check it more carefully in slow path */ - if ((s32)(tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent) < 0) + if (delta < 0) goto slow_path; /* DO NOT update ts_recent here, if checksum fails @@ -6198,12 +6215,13 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) if (tcp_header_len == (sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED) && tp->rcv_nxt == tp->rcv_wup) - tcp_store_ts_recent(tp); + flag |= __tcp_replace_ts_recent(tp, + delta); /* We know that such packets are checksummed * on entry. */ - tcp_ack(sk, skb, 0); + tcp_ack(sk, skb, flag); __kfree_skb(skb); tcp_data_snd_check(sk); /* When receiving pure ack in fast path, update @@ -6234,7 +6252,8 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) if (tcp_header_len == (sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED) && tp->rcv_nxt == tp->rcv_wup) - tcp_store_ts_recent(tp); + flag |= __tcp_replace_ts_recent(tp, + delta); tcp_rcv_rtt_measure_ts(sk, skb); @@ -6249,7 +6268,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) if (TCP_SKB_CB(skb)->ack_seq != tp->snd_una) { /* Well, only one small jumplet in fast path... */ - tcp_ack(sk, skb, FLAG_DATA); + tcp_ack(sk, skb, flag | FLAG_DATA); tcp_data_snd_check(sk); if (!inet_csk_ack_scheduled(sk)) goto no_ack; From patchwork Tue Mar 4 15:16:01 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: 14000904 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2047.outbound.protection.outlook.com [40.107.21.47]) (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 00939284B31; Tue, 4 Mar 2025 15:16:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101380; cv=fail; b=abXyqW+OMTx8xVXN9qGLdtMFFTZA6uu8DMbLHxeONV0uQBNx+453VdRcqB94c9mfg1kHIa6HvKdf/v9dfdbcYUDVKnCRJxgsZpyUI+9UOdorXbKunD0gvGMcV0JXiMNwcchz7JqnmWdsGfZBXfj/XCUGq1pKRgNxwoYf3J6WE1g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101380; c=relaxed/simple; bh=yL7yQyw+fOPNNdHg98sMQDrvfwIn9YYy0na5JwuRmrI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=qNTrYostsVGy0McH9MLg5zo3FUrSsSvmTPrDqgsCiIflQ+cZ9PMDK1zqKa4g5x8oyzzWHQe+6yv3LTh5VlIIHwi7WH0KqUE8qYkFj9j9rb6szDebR2+OSV2a7jItwoxZdZHl6lpkr/4A+4s+5jDB7PUaNs2u45UqyUciAYpJ7GU= 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=A1m4a1I2; arc=fail smtp.client-ip=40.107.21.47 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="A1m4a1I2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Thvx6efPwyd8G4flLb4+LJB+RpiSVm5aDL1U2bWLhUNTAX3Gm4LdP6+BXL4XM9gtc6lCAfevRlI9h8PSE6SFgQE5zndcaO08lOTKe3sCpr9l2hVFypRjjp+GqFeiscKnPoSD3AfDJq/OMxGTSmjvdT90L0OOUIFuuBBfcsKXwrvqDoJw2X8k2V0IEGbuzO7WvkFNTHh0nv/65zyWECgBHF/xitk/Ix0n50MSDJElutkH+bwOWxtTAn4bFsoMxpkV07aKFy5jAdkDD4e9DOEusLVO5Y8CF2eKO82d13YDQKTDGfs/7ZJmOv2t/vRwiJJWbV8ayLW3nNONpUfRvCJouw== 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=ZQWybgqsQ7JT9ksdd06zY2pYwS4ceOtCbII1UUuweQ0=; b=eEh4FdRlNwmceyMBUdr7Em/vwDdB/HkNHNbluygFdi92JLu7EsADpTmvBrrSudRQNivz8EYhxCpHsIbOaV37fyz9f0brHaB3RHLig//jBA0vTrd2XDVPvq9ZN0QG96rsBe/9UYhsP1cJRrgOE1q+d4Bg9HSEOGBMrgtZrvHA8JIM6hJnrHFcOc4iv8Fy28tYATj7uYLyUESMuULnaUUEj90N4m1c2rewBihd7AnLi761jRL8RNYnIbkd4OVFqNW0aGp5QFUUDLZ73IEew72I+TPL8/z5d7muxd5QdN9YotTO+1Ree9kqZG8LbOQ27GejPsPZ78OP99boIq0bDd7ycw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=ZQWybgqsQ7JT9ksdd06zY2pYwS4ceOtCbII1UUuweQ0=; b=A1m4a1I2LZqyN31I4IiZC5W7/kH7198WnwanR7Gsc0dmBlFTjvacubAQLf50tK4wARA0sP+l7zct5Di+aoZ2yukLSNJ6zy4hG/exm1S4fPCG/KKB2WLbcEvykd3jv+SeVD8j/1ohV/k5ZqtbEgQvs4PZSBJOpXCR6fy1GUoYvAykUUAJ8WJWu374kDyw/ySXJUqTj95QkB2FxzzlbTwsW2rdcC7TnjbLn97Hu3zgEevwQ4h5bQWktcMixb/L7fu5a8AJshsyCgSPUhPZ9GiSbxv2fKUHmsIFMUMP79264bRrom075eM9VEvfquXSvJEbqL8s6mwbK3F3PRKiwIzxTA== Received: from PA7P264CA0128.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:36e::11) by AM8PR07MB7506.eurprd07.prod.outlook.com (2603:10a6:20b:243::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.29; Tue, 4 Mar 2025 15:16:15 +0000 Received: from AM4PEPF00025F9C.EURPRD83.prod.outlook.com (2603:10a6:102:36e:cafe::29) by PA7P264CA0128.outlook.office365.com (2603:10a6:102:36e::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM4PEPF00025F9C.mail.protection.outlook.com (10.167.16.11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.4 via Frontend Transport; Tue, 4 Mar 2025 15:16:15 +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 DC8C324F98; Tue, 4 Mar 2025 17:16:13 +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 03/12] tcp: use BIT() macro in include/net/tcp.h Date: Tue, 4 Mar 2025 16:16:01 +0100 Message-Id: <20250304151607.77950-4-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM4PEPF00025F9C:EE_|AM8PR07MB7506:EE_ X-MS-Office365-Filtering-Correlation-Id: 51ec70e2-779d-4f5f-edf7-08dd5b2f81ca 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|7416014|376014|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MOetXRYHiRi3bDcj+v7vrywYqUiSdPO?= =?utf-8?q?G2tmBv4IzX7Bm7ehwCP9c8Ag28HG9DmU7kd/OP0hi/QxeNrl849K6JxrpkCB610Si?= =?utf-8?q?K/Kc2nDxo1A87w6ldlmyQdb211uab7FmPG5MaJlkU3TpU8GZNm1pfURgqfBzHNFka?= =?utf-8?q?R53Cr5ikCYWmD93IjcgyQZeRVABtfCZ8gGC9799vwazRr4LF+YVA8dBrczSzsKuva?= =?utf-8?q?3tfcb4YuggS4YTMuR28srwyfA52eTSAc8t0eQMHmIjhMI3dx/cwux1HXQTGLBw08c?= =?utf-8?q?qTliS4r0kguRUZfNPskrIv5xNNSiZCPGJi6lOjuGPZZPcKjdTzWvL4X/el1NCq1zx?= =?utf-8?q?PASbQHEtDo+IgwukUHiulCVZgQzA83ybtQr9w/W9wCdSiiSbWubeQefyP1y1kfE8u?= =?utf-8?q?+vL2Em/avIDlSRS74UiQUmdTC8PlYeOIZd4+1GaGNUkm1v6eFH10Qe/R+BCXrSiFB?= =?utf-8?q?q7DWpSPopZM/3ksrNTJEhGkk8Tq6O1ZSKBfUa+03Zv7HO30mxXaCTyHPZG/xZMQH0?= =?utf-8?q?JEkeyeLssDHAz8CUyFAtAEDZkVtdsOruGRHNF0HoF5bYBcreW6cBaExZKLUEZ4PyB?= =?utf-8?q?Qk0ZmWseStfj5i77ke6jIlugOrFgcNmLxfLK2jS5PR0Zy1G4id156yaAy57NLIUhy?= =?utf-8?q?Iod4rO95gthkqTsDY90TNPPkdXpwEAFE+OvqWKkaq9uyuZUeP7JnELrFhgmTrxzUc?= =?utf-8?q?UTF5Xt3mCOTfXRCByq42ezXhfPqBg208mT4M5TLmQe3JGtToJ/JFvA+z+H83mpIgY?= =?utf-8?q?nosuQmal2Jg+8MIfTzAcm7tu6CcFuNVeWLSJNjCCOzzyUz5flO3sa8jr5MkNiEbXd?= =?utf-8?q?Scz3U/ktXL+J6frcKHKHKYYcbPtIELO1UiSo02ZVM+DqDTQ/2Icj2dSZ1SuoxTs0f?= =?utf-8?q?OfuJSXnepN4jXZcI6+q9pafUcqkTqCQC+BtOH6GTCpcQ/tFnEulQjj7/DEPeCcjIq?= =?utf-8?q?chK2MJZ1vXUzpxknGh6oV7MZzhU4oci7Xj1q3eZuHSyI1SFniiBZzOcInlACGwnW/?= =?utf-8?q?YgYjrbZCvX1qF6vL/KNxIjmk53xWTgwK8/N9VMsC4diyLyh2HRJ/egoRVxM4K9cFy?= =?utf-8?q?FgP273SY8DwQ33EGCf0ekF2qE+QAwIazaDfUJxJvhgnRpLVon5Usik8BT6CA452HV?= =?utf-8?q?0TSWlVDukF3PeAKdhS3QC7eVmjIKYvHTkksBB3eK03pWLJCPeJJDqu5bBLvgwLlwm?= =?utf-8?q?iiiOliddOgDWIanoqyhrtgnMMdiOb2hUhDnOF24ERZZLWgfjWXrvjw1fzX3GdK5U0?= =?utf-8?q?u/6d3dHJyB4KWyBxHY1BsJ0db1uU9iWwPzMIWANOM9ONz3LrAYjup0nZbOipDSbCs?= =?utf-8?q?bcLseV0jQAlGzcZZ9FTuECDa0F14vBuv66tM99UPmVLZGXLJH/qX0n72fxtKUD93w?= =?utf-8?q?5CT16eqU6/ohb1SecBtYEJGjPM7bnqXUq4RFrKRAYIKnRsd76SnxUVNqGe8+81mL2?= =?utf-8?q?WZSYgx2iBQ?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:15.4691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51ec70e2-779d-4f5f-edf7-08dd5b2f81ca 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00025F9C.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR07MB7506 X-Patchwork-Delegate: kuba@kernel.org From: Chia-Yu Chang Use BIT() macro for TCP flags field and TCP congestion control flags that will be used by the congestion control algorithm. No functional changes. Signed-off-by: Chia-Yu Chang Reviewed-by: Ilpo Järvinen Reviewed-by: Eric Dumazet --- include/net/tcp.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index a9bc959fb102..71754d5916f3 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -934,14 +935,14 @@ static inline u32 tcp_rsk_tsval(const struct tcp_request_sock *treq) #define tcp_flag_byte(th) (((u_int8_t *)th)[13]) -#define TCPHDR_FIN 0x01 -#define TCPHDR_SYN 0x02 -#define TCPHDR_RST 0x04 -#define TCPHDR_PSH 0x08 -#define TCPHDR_ACK 0x10 -#define TCPHDR_URG 0x20 -#define TCPHDR_ECE 0x40 -#define TCPHDR_CWR 0x80 +#define TCPHDR_FIN BIT(0) +#define TCPHDR_SYN BIT(1) +#define TCPHDR_RST BIT(2) +#define TCPHDR_PSH BIT(3) +#define TCPHDR_ACK BIT(4) +#define TCPHDR_URG BIT(5) +#define TCPHDR_ECE BIT(6) +#define TCPHDR_CWR BIT(7) #define TCPHDR_SYN_ECN (TCPHDR_SYN | TCPHDR_ECE | TCPHDR_CWR) @@ -1132,9 +1133,9 @@ enum tcp_ca_ack_event_flags { #define TCP_CA_UNSPEC 0 /* Algorithm can be set on socket without CAP_NET_ADMIN privileges */ -#define TCP_CONG_NON_RESTRICTED 0x1 +#define TCP_CONG_NON_RESTRICTED BIT(0) /* Requires ECN/ECT set on all packets */ -#define TCP_CONG_NEEDS_ECN 0x2 +#define TCP_CONG_NEEDS_ECN BIT(1) #define TCP_CONG_MASK (TCP_CONG_NON_RESTRICTED | TCP_CONG_NEEDS_ECN) union tcp_cc_info; From patchwork Tue Mar 4 15:16:02 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: 14000908 X-Patchwork-Delegate: kuba@kernel.org Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011049.outbound.protection.outlook.com [52.101.65.49]) (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 BDDFB27E1CD; Tue, 4 Mar 2025 15:16:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101384; cv=fail; b=VudIsVoaS3/ySFvmYDUOu7LmmC8ruxFEQUX3wmPl+OaQWrHUzrIoY0lHFTtS5obp2mO2WrlGY2O4CxAXtv+L7ly+IxwM9PVVK3F9AxofwbY/KItU+rWQ+F5PVRDWcqUToxhtU6EPTZNk/I2AFHqvz2zA/F+vEj9udSzJQRxbbuo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101384; c=relaxed/simple; bh=bA19Bgpx59I0ZPvtfckmXShS5/xeaVVN/XJQwYHkm2Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=j2iKl7cikARUZGxhEQrIwMyYOVO2H/wgozmdpcGmLIXtBQeVlduc3BGqmf8q6Eo0THIp5vt8dTu93sDbku0VOgdCZyMgCpF6C07yr4BK1k6+BRw/E96t8EvDqrt2LFBpXtXRQXO6f+5JOimGw57xTLN11FkKXsticY5F6PLoIp0= 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=ngg4cc70; arc=fail smtp.client-ip=52.101.65.49 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="ngg4cc70" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E4HHbqcXjG7tLgkV6WCGhT9bi3ZF49Y6npZWE8tjOpl0iOhgXL4oiX16VFoIgXbXvKqpzVXcfw9MYfXCy48TO4s3Jwo8J5nIVzNhXC/u2asVzD2iUCcBoAaH3LYKp5LAgKSbZMzzf/2HqvKD/75el9O7hnJE8Et1HUsz1M2gl+HoONb5BTLY/Tbj8f+lDMz00sZAu4lIQTF7LMXOLHaK044MODdAxuAz0Cq7AR+aJIoTQj0Q/06iMwnojBCbF/VxLTooJAlirMdZgEfdiPEcmJx8Xh7M4/3VdBBO5PLeI2VVbuEhtQijxnC7bZYIBtDnJdG7d8/XOaH/8OfRe9KF5g== 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=uc9vVUPhzHEVD79jRHb5BVINbtRTTLDxS7wnK+13uWE=; b=KN6cWeNpMco824bkwOkPF8y86gnXrvW4rImMwVtgcEXPfC2NAP3EmIImAk1EUxS4D1FReUlyT3kC9x+IjL9eVBjJbi5ABPI9FmVEFnkVvNvtCQ7PJjU+Kt9zpxY1kqVXKDGcG8aZVHKCZfiqBTUsv3N/snsObP9Zm0ItG5w+ZSIl72TkhodxQWHpLhn0GQKfmpLoI74u4MS9m9RvnbGXR2unj5MbRMgEsHNFT80SPL11/t3Env1ruHBsinLziCBOZIMWErFJvxWrF8EqdwfLPNsv13yR47QzXAIAyghrfCpc1ad8690tvMdwk2WcRBBAyXIps/zx8JtCFYYQIlnatA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=uc9vVUPhzHEVD79jRHb5BVINbtRTTLDxS7wnK+13uWE=; b=ngg4cc70yxBEdXt9UxBcxj+M7UCKNQmzXA6b2GcvY4+jTPI7t6VAlUHgxutXB0du7DjH0BKaaxC3i2QGPuqNdL11RCif4QVC6KldxVdlpbeH6tDo/JukqCPJVJaxg4lRnKhBq72JxNyOYQlndcFOs8yMZtLT6V6keogdj7poVyrPkmL5i9nq5Ntmcd36alHIUwOlEm230Bie/XSdgxDpcpZI6rgUh2r7d8A8cJVM9qRjeXZsD35zWjMpDHu6b0MZgeHBGlfGkpKp2CcKHA77nCgp6e422ghy7qga/vsBCWNI5lxNHEFo5m6gZRLEKeauwth+ltiUtRO+kgWpg6CHxA== Received: from PR1P264CA0096.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:345::11) by DB5PR07MB9513.eurprd07.prod.outlook.com (2603:10a6:10:48c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 15:16:17 +0000 Received: from AM2PEPF0001C713.eurprd05.prod.outlook.com (2603:10a6:102:345:cafe::57) by PR1P264CA0096.outlook.office365.com (2603:10a6:102:345::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM2PEPF0001C713.mail.protection.outlook.com (10.167.16.183) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:16 +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 3924F2118C; Tue, 4 Mar 2025 17:16:15 +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 04/12] tcp: extend TCP flags to allow AE bit/ACE field Date: Tue, 4 Mar 2025 16:16:02 +0100 Message-Id: <20250304151607.77950-5-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM2PEPF0001C713:EE_|DB5PR07MB9513:EE_ X-MS-Office365-Filtering-Correlation-Id: eb78b578-9052-42ff-7d62-08dd5b2f82a8 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?HXHHATnnUQnrpMhSWK3K4zDoFRiJ4Lv?= =?utf-8?q?RTbNIufdhahlOGjihzWjf6Xi4Zp1pFjcGcpNranR8Wqd2fdjZZIjjisSh51DOPG0c?= =?utf-8?q?+o3vRFnYdurzXiH3RQfS9IFyDr/L05whHVY56ZK8LKO4oemTTpXv9AR7kP0FdrS84?= =?utf-8?q?hvJlruy2oYHzc1O16kUSm5sI0tvEI6jb97EFoLwxH6C+5vz/ozZ+md1rlkoGSeiSz?= =?utf-8?q?ytQ6LIGkwtcOKENfYWcOjTiHwFZ5o7tq7kzgxtLutVniGHXVI8SdNeZB0cBhV0+vz?= =?utf-8?q?hJKDTikTgUO1fZJ+1FjBPwc3oFK87dRelaafvEqs7AKXJFA636gJQrHpYs0oATghk?= =?utf-8?q?3PUtN4u5CBsJ4Ggnfmq6WDvTidrhfTEvBymneFAJevvjncITYt9bzaP9shNzah8ba?= =?utf-8?q?2zAnPsKjvj8EOxezaHpcp+Z6zbnqMoGEMTYYEUgk0ztWI2LezAMy0MRymsU934hsW?= =?utf-8?q?bd4W0PvT2l1Sq8COZOR98LyX6tMIm5Q7wqfZ8k1oxyjpVt5rEI+iF1Z0xN6RnD0Lk?= =?utf-8?q?ACep9+l8Mkvwbd1A7GfgEmi4eXs8xB2YAcabHBSGRqWzJeCZYPmcW+qKaTrED3iUb?= =?utf-8?q?OR/k6oSF0Z/1lfljXTGrUPD02AufAEpJ26+9PN+PUNp0d6HFlzUqWk+4q/o3TLPv/?= =?utf-8?q?G+gaY2VXtgPa9KmufvfEPR4ZHkthCSC0ywYh+/REfC4MGKG7RByujyb2nIG3A4kqT?= =?utf-8?q?5xehZmANVw+oAGmc/zz9R3UMn5vfGdwwMkr2zgMvlQRkgyMiXxMYxS9QRFlQ1fsC+?= =?utf-8?q?gWODm0Ogwe606cJ/rDQPdQ0/e22QA9o+QPFgjaEiPKUrslWKhElOxBzt/zdbLdZVs?= =?utf-8?q?zBYCucwBAyH0BjN2soOSbt/TF8IF3682T3Voc/bZJ6JaCllMlRfGn9a2EAepVCf9g?= =?utf-8?q?vJJl62xxjmaaGqgT/IuF1l5GjDUtZCDU9kJbW1zIYyPPpWLvA6z1g7wrQwuneh3BN?= =?utf-8?q?C2B7Iv/Ugi49d31wQjDALSwo7p49Dgxe53Wo81aSgAFL8iubgc/9j3cPHTTh/Bdah?= =?utf-8?q?0lx8E/URucVCG5dGYAyVdS4QcKzXT67xMshNZgpYh+erxL+Q8/8AeyzhUlRnxkz3y?= =?utf-8?q?IBie6F9YHopC2itfsFp26Bymmpun168/JWztJpeR5ww55a4xPrW0YsniiMMxUY+Fz?= =?utf-8?q?HVebplAA8ZEiwHHrcl/aoZhl59tbGUH/ovSIc7tZcLZAoPZl+dHWa5v4K+nVQBe9E?= =?utf-8?q?PNoe3LH8gTwKRX/azNOxPUjtCVpRsQQwQW4MQPy9dEjk2FQlX/SVhXVDm72Wb7a/y?= =?utf-8?q?MjzL1OU4kxWFaaUstLwR9ngeJhrdHy/hmra+/fTra6JqsYoGzYguaQnaL9EQE92T5?= =?utf-8?q?nK+/PLxV65aCNerdC7f9+G0EMmooIabvGA/Bd8XO7huhLFks18qIidN/kAdRJvdN9?= =?utf-8?q?kkhkIage3Ddu+ZqBYTUo8CLFTeOLEwVZWDNF0rkkY0T/UEFsAu7dTw=3D?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;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: 04 Mar 2025 15:16:16.8274 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb78b578-9052-42ff-7d62-08dd5b2f82a8 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C713.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB9513 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen With AccECN, there's one additional TCP flag to be used (AE) and ACE field that overloads the definition of AE, CWR, and ECE flags. As tcp_flags was previously only 1 byte, the byte-order stuff needs to be added to it's handling. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- include/net/tcp.h | 11 +++++++++-- include/uapi/linux/tcp.h | 9 ++++++--- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 8 ++++---- net/ipv6/tcp_ipv6.c | 2 +- net/netfilter/nf_log_syslog.c | 8 +++++--- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 71754d5916f3..49b66b499429 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -943,7 +943,14 @@ static inline u32 tcp_rsk_tsval(const struct tcp_request_sock *treq) #define TCPHDR_URG BIT(5) #define TCPHDR_ECE BIT(6) #define TCPHDR_CWR BIT(7) - +#define TCPHDR_AE BIT(8) +#define TCPHDR_FLAGS_MASK (TCPHDR_FIN | TCPHDR_SYN | TCPHDR_RST | \ + TCPHDR_PSH | TCPHDR_ACK | TCPHDR_URG | \ + TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE) +#define tcp_flags_ntohs(th) (ntohs(*(__be16 *)&tcp_flag_word(th)) & \ + TCPHDR_FLAGS_MASK) + +#define TCPHDR_ACE (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE) #define TCPHDR_SYN_ECN (TCPHDR_SYN | TCPHDR_ECE | TCPHDR_CWR) /* State flags for sacked in struct tcp_skb_cb */ @@ -978,7 +985,7 @@ struct tcp_skb_cb { u16 tcp_gso_size; }; }; - __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ + __u16 tcp_flags; /* TCP header flags (tcp[12-13])*/ __u8 sacked; /* State flags for SACK. */ __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 32a27b4a5020..92a2e79222ea 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -28,7 +28,8 @@ struct tcphdr { __be32 seq; __be32 ack_seq; #if defined(__LITTLE_ENDIAN_BITFIELD) - __u16 res1:4, + __u16 ae:1, + res1:3, doff:4, fin:1, syn:1, @@ -40,7 +41,8 @@ struct tcphdr { cwr:1; #elif defined(__BIG_ENDIAN_BITFIELD) __u16 doff:4, - res1:4, + res1:3, + ae:1, cwr:1, ece:1, urg:1, @@ -70,6 +72,7 @@ union tcp_word_hdr { #define tcp_flag_word(tp) (((union tcp_word_hdr *)(tp))->words[3]) enum { + TCP_FLAG_AE = __constant_cpu_to_be32(0x01000000), TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000), TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000), TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000), @@ -78,7 +81,7 @@ enum { TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000), TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000), TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000), - TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000), + TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0E000000), TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000) }; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d9405b012dff..fab684221bf7 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2159,7 +2159,7 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph, TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + skb->len - th->doff * 4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); - TCP_SKB_CB(skb)->tcp_flags = tcp_flag_byte(th); + TCP_SKB_CB(skb)->tcp_flags = tcp_flags_ntohs(th); TCP_SKB_CB(skb)->ip_dsfield = ipv4_get_dsfield(iph); TCP_SKB_CB(skb)->sacked = 0; TCP_SKB_CB(skb)->has_rxtstamp = diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 24e56bf96747..efd3cb5e1ded 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -403,7 +403,7 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb, /* Constructs common control bits of non-data skb. If SYN/FIN is present, * auto increment end seqno. */ -static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u8 flags) +static void tcp_init_nondata_skb(struct sk_buff *skb, u32 seq, u16 flags) { skb->ip_summed = CHECKSUM_PARTIAL; @@ -1395,7 +1395,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, th->seq = htonl(tcb->seq); th->ack_seq = htonl(rcv_nxt); *(((__be16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | - tcb->tcp_flags); + (tcb->tcp_flags & TCPHDR_FLAGS_MASK)); th->check = 0; th->urg_ptr = 0; @@ -1616,8 +1616,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, struct sk_buff *buff; int old_factor; long limit; + u16 flags; int nlen; - u8 flags; if (WARN_ON(len > skb->len)) return -EINVAL; @@ -2171,7 +2171,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, { int nlen = skb->len - len; struct sk_buff *buff; - u8 flags; + u16 flags; /* All of a TSO frame must be composed of paged data. */ DEBUG_NET_WARN_ON_ONCE(skb->len != skb->data_len); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 85c4820bfe15..a2fcc317a88e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1731,7 +1731,7 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr, TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + skb->len - th->doff*4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); - TCP_SKB_CB(skb)->tcp_flags = tcp_flag_byte(th); + TCP_SKB_CB(skb)->tcp_flags = tcp_flags_ntohs(th); TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); TCP_SKB_CB(skb)->sacked = 0; TCP_SKB_CB(skb)->has_rxtstamp = diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c index 58402226045e..86d5fc5d28e3 100644 --- a/net/netfilter/nf_log_syslog.c +++ b/net/netfilter/nf_log_syslog.c @@ -216,7 +216,9 @@ nf_log_dump_tcp_header(struct nf_log_buf *m, /* Max length: 9 "RES=0x3C " */ nf_log_buf_add(m, "RES=0x%02x ", (u_int8_t)(ntohl(tcp_flag_word(th) & TCP_RESERVED_BITS) >> 22)); - /* Max length: 32 "CWR ECE URG ACK PSH RST SYN FIN " */ + /* Max length: 35 "AE CWR ECE URG ACK PSH RST SYN FIN " */ + if (th->ae) + nf_log_buf_add(m, "AE "); if (th->cwr) nf_log_buf_add(m, "CWR "); if (th->ece) @@ -516,7 +518,7 @@ dump_ipv4_packet(struct net *net, struct nf_log_buf *m, /* Proto Max log string length */ /* IP: 40+46+6+11+127 = 230 */ - /* TCP: 10+max(25,20+30+13+9+32+11+127) = 252 */ + /* TCP: 10+max(25,20+30+13+9+35+11+127) = 255 */ /* UDP: 10+max(25,20) = 35 */ /* UDPLITE: 14+max(25,20) = 39 */ /* ICMP: 11+max(25, 18+25+max(19,14,24+3+n+10,3+n+10)) = 91+n */ @@ -526,7 +528,7 @@ dump_ipv4_packet(struct net *net, struct nf_log_buf *m, /* (ICMP allows recursion one level deep) */ /* maxlen = IP + ICMP + IP + max(TCP,UDP,ICMP,unknown) */ - /* maxlen = 230+ 91 + 230 + 252 = 803 */ + /* maxlen = 230+ 91 + 230 + 255 = 806 */ } static noinline_for_stack void From patchwork Tue Mar 4 15:16:03 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: 14000906 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2068.outbound.protection.outlook.com [40.107.247.68]) (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 CE1462857E4; Tue, 4 Mar 2025 15:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101383; cv=fail; b=sSuAQ7ZPyBBAEgLxe2kY3rMAMiSEDoXolJhaAxbglkCJxCvoHfJ8DHmCqyY9y51Tth7bMoQxCp6UY+HeTAC/1hENLmyK6QUOmL2JcnjnFGIfumRznzHHi2Wl7mup+bqfKHB2xnETBoRh0xvs1PX0jIexBkn0Hf8IPN9P69HlGiM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101383; c=relaxed/simple; bh=HxJALqWnEF8Whxp0ZdFTJB3/DnjfC9ktgSbH3RujgEk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Y0G35WzVMiVoBekRzPEyAk520oEeWntOeAlqj2zlTtDwM/brNhCmnOKqneKa2qJ7QGBXYC3jE7MHVsATwqTM07nWo5wbOuj4HN3Ze0HL21bveUZ5e/QzdxoBaoWzI3gMycVVdF22keeXXVa0bwUCUkSpePYT3DEz/TyQOFcCIUQ= 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=FrT6nwRJ; arc=fail smtp.client-ip=40.107.247.68 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="FrT6nwRJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xMoovX3N3ZhpBMsfB9Cmf5gCXB2k7W5cG2k/L64sP4UF0y2ow2QFbvBuxWHgrkXfvSHLrCmeEbmE1NcqwNf8xlOX0QqIFyfcWQol3RLhm/fZ6weKdkPfHTuGR2u1hwm8X3aXsrr7cwZojWUqTw0Q4f6DN8Xl9uvB2iw4YIqVJVg+ezPB9rMSU7nQjIvnDYPR4LjeV0UkxTjObfhtWSmpKjD2kFj2QQc++qCUyKKYKnFm5t6vNeby+am7jWyBh5ZBVtwP7NYy1CnmlCYsJd6nvH1ZTlc3N5AWkoCMusNt1+g+U5NZEfmbHjAjq22OVaSQE9sU7gUjUvxaF0pbvZ7wDA== 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=ha5JHdBjV1StbX5qBq3isJSlzHVJSFp5KbWWUENSRm8pIZPfswfAm4Ex0LsBh0qYoD0SS3zSpBAEL3lKTmDLeHzIzIzsSMbG/0EfkAoHX8dBxERJ/7iRPvCAbbGRyw7y8B+31qcsoIJZT08B4XA3ckXCgSrqAnPe5zsLePQFMacc8QlOj4VlrbNUl2PElhnL863e9uXCaXzeFdmAEYPyccgBgN3YcKDrRdmmD9syVlqhv67EkbvlO/yVgmYH6n/hy4jtEGi2AfEmS7BQh2Z8fP1bIeSduGXIOagmtv8XiW/hWMjl8Q1zcrHkDd5/9NxJFhJoqC7hxseVhHDpSbIdXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=DTSh1SaQdAu7He1aPYFxG7DTSFXD9HAX4cddFz0FSPk=; b=FrT6nwRJ4U38OP/IEMmd5AJhcuSTWX1BpBpRBLZwsmK5DjkzzU/crtrJzqH/p9St9Qxo+tpyOtgssRdLkgEf6vVEE2khj86XDFplgFL25+nraniRVZ61xbTlijWxsBlfHsnU/+V5ssYkBPMMVZOMNlPepmYdKtj0D1YYE1kxYZK2jMziEY//udSb4RcVTXYyPHvMtM7rJJd2MVqBjKAD/7V7WdhckMHp9OxY2RCABnwSp63BOjSZiSPichVNfX2J3rQck2VW+d9WJOhxWLdTCyH6Dpt//MYORIOTzsL+WqyMACSA16vuFmzkkkYTRgbex/coMpU8MtdWV864TiyPXw== Received: from DB9PR05CA0005.eurprd05.prod.outlook.com (2603:10a6:10:1da::10) by DBAPR07MB6630.eurprd07.prod.outlook.com (2603:10a6:10:181::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 15:16:18 +0000 Received: from DU6PEPF0000A7E1.eurprd02.prod.outlook.com (2603:10a6:10:1da:cafe::f4) by DB9PR05CA0005.outlook.office365.com (2603:10a6:10:1da::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Tue, 4 Mar 2025 15:16:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by DU6PEPF0000A7E1.mail.protection.outlook.com (10.167.8.40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:18 +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 8B70124D60; Tue, 4 Mar 2025 17:16:16 +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: Tue, 4 Mar 2025 16:16:03 +0100 Message-Id: <20250304151607.77950-6-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: DU6PEPF0000A7E1:EE_|DBAPR07MB6630:EE_ X-MS-Office365-Filtering-Correlation-Id: 35e7922e-ae97-472f-abba-08dd5b2f837c 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|7416014|376014|82310400026|36860700013|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?/vWPLpN6M/ocCVJ4HHTX0JVGybtNRvJ?= =?utf-8?q?xG84vEGM79UhPDLvrZ2KZhSzpm7JaZDbWAKt1lePWfWzgtLwYAlVQ8IJLx5S3JRKT?= =?utf-8?q?rpKIY2sf1Aj/P/diQ3Ynlul8EnZ8B5mzUvkw03vIup1byibBeE7x2JITdnCnzPhGM?= =?utf-8?q?CWO++dZyllfcQHW187kdWW3mTczNAJttcdVfFahsCzgZ4Jfsl07yUQB4B7qHxjggD?= =?utf-8?q?j62auigHsj9uCnIlUVb4NgVhY6n4SHX92ta1n9/ICB6l2GgR0L3h9kh4YG4LqwaKw?= =?utf-8?q?qelHcz7QGsPA7xYB3PFAT9V3kEcNaoJiqmwg6QdUKLbcoURXXLPoJ3b3UWM2xI1Ym?= =?utf-8?q?w/mvPqX2WYsYtU/Alct3AXkKTzaze8nC3OW/hkWpQThcKRgEC8dnpJcOa8EBswUAM?= =?utf-8?q?/G1THjkdAG0zi2imRXL7OSiu6iIAJexCyVpG2x9BGZToFyqYjCRDD2d/9+EldrsOC?= =?utf-8?q?EPFmd04IX4pwvP6uGXrcRbycX/8/3C1qWKtYM+RGu1KXEJlyPnmkDUOXAwJToRxYC?= =?utf-8?q?XSzmxQ7yK3X3OCeKI1DWESqSmJWOgEK+4Ck8XmucuhYtckcjGrylMNvgvIywu42qU?= =?utf-8?q?g261baArFHjk08ceDgsyYFWbqSETPdCbz/XPnpvbRBU3s1cQYrHfJs9J8OUaTWUCv?= =?utf-8?q?EsjWQ9+taNfwDvhphqDN0C/naw5a1y9CvJ0sDXYEJIaeDfJYdkMRMDuibhINk0oeQ?= =?utf-8?q?VVNVdMZsHBcj0rPqFcFdK3YigfNGOqlhg+5aDmrHVwywJ9S2YQKsGwn2stu24L1Hc?= =?utf-8?q?ttQdY71LRQMOaboh7AR05yJhA1RtPjmZlg+/Oet82dGIqTfuXIPxbSTXqNssG7hlZ?= =?utf-8?q?oyKXrf05KYicMi8pQtQ59Cawo2RuLjXB0E5IAPCyKyoYV3ZxQTLZAo/RuOM52l3mh?= =?utf-8?q?5CS+SFoNsUTF2fAs2nswSxGZNWIcZwZET31mTiPZy8613C0KwzRTUv3LjV8NmVoX0?= =?utf-8?q?SJl9SW7SSQ0sxVt9z18+6zG0o6zGusjTRIAaBmUIw+DKBjZR30NTRjw+n61gatBAk?= =?utf-8?q?QmVsWhgXfxkfI7X2lCu0z4e5G2GL5dVCNMxhCX8oVYox8q+FtAn3ZIBWwrrDlaHZI?= =?utf-8?q?tmKf4ouMFpLHwXcmxZeFSf8RGGa8ig22vKYNjeX9ikU2DQsQB/BTwpFUxRzwJwGm6?= =?utf-8?q?LqPTfu4ftJcvk31rO2ZexLHBXxuGZFzAz3B8oRXwtWd+fUZUS5XvUE0K72AAb8DMt?= =?utf-8?q?TQDrwJE082/fk0K1OkLKR9dAGoLhcPWV/sOIcZLnf1RHypCuj7H+YTBi9UjSECqoE?= =?utf-8?q?jDxj18rMOjxRKJmsM9OKuyaqTurjLyOkMNT1gH5JqjybuAQzjVFlvgg2goq0AL3JI?= =?utf-8?q?v8Te44Z0fGxkcXSoATZmj5kcYovX9lN8dzh9yTEjoddTkbtBafpbCfKzHNJsCnBMG?= =?utf-8?q?ufZmcMfp6FOMaK8/x2PgzK0oS5wR7GEkoNp/nAIapKSQpvhf8oquEGgEYKAMdmTzC?= =?utf-8?q?L7iGefVxyg?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(82310400026)(36860700013)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:18.2804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35e7922e-ae97-472f-abba-08dd5b2f837c 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF0000A7E1.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR07MB6630 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; } } From patchwork Tue Mar 4 15:16:04 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: 14000907 X-Patchwork-Delegate: kuba@kernel.org Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011014.outbound.protection.outlook.com [52.101.70.14]) (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 C0E312862B9; Tue, 4 Mar 2025 15:16:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101384; cv=fail; b=ICcHd7nw52TXFp7KMt0RlI4joOKumdQ2staQy+X6jR5VD8frUCsOhaslv17i0ZCghPVC73J92DEnHV99IonqNJPN95oCphF5pexykTF7XQ77b4FKMlrVXeJcDJDWsrUCsdrIvn598ryYw1lPro1t8q/uMJZQw/9Buyo6w/CfL0A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101384; c=relaxed/simple; bh=Ulhva8XrbgA5oAhnhsw2Uqah86jbo5pF+6CBWOuyN3A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=slX+RXPgPygjyUhf6lOfUEsjssLFCXhhkfyDC1zIX01nhJMQQ/+nWzD15tqMj+RFpe91n5DdnDUXGVeU5HfCvBIEcVKOPqe5T7M29tIjoU4hw1fZI3Z5KVSuGpSKIt8VmhaEasUVt/82cyYHnswlG1MXe7YXVJ+03KbRv/6Q7uY= 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=Cz0KiiIR; arc=fail smtp.client-ip=52.101.70.14 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="Cz0KiiIR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=afM978J2jppi3Y/6Eb8jTWw0xdwy/N5/g8HBA8Z6H9lQ2W2sVVRGqTUlm4yQ6fJ24WTpGUulTmfJ7K8+BPnZNmzQt4k9hNh5VglbyBRZMo2Lttpm+YSmpiKGr4MCdEKJ0MNG8uENSR+qLycUbme13rhdZ89YKYj77gWFC8hzgGTskZ4J/mSaKgfjZmJ0iNGDAGfHjR9af+gFavs5WMtajf5atfM9deVBAATqCIzJ1MJRDIG3Tvj7aHZGkzGrC9MRtTbNJZaDE+V1LOH503KExCz8SpRiynVSX3XAowiMKhlp4GohW9CFusYtU0bZl1mE90smwJYgfzFeprM/H7DHgg== 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=M1hOb9LCv/YaASiqgdTDb3G4/8C1/qDxqxoEGYEqugA=; b=LPKCUjsPjxjv0CCT0pLdjuhs1RotIh27Akltj+5vfGeZH4RcEthdqVl02q/QUSQLNbMKplP+eHJUn8WpkcPVKeI/18CZQjaYJEi3zjFUlMaWNdREuaoFwSl/xTndqTa3eLswve9RgLEnCReCN/6SujezkV4l5WVRhFKcP5+F8M0p8kygXfOHlS2aVYg37e875rcAqkwMQcllPqSEdN5/cMD/EdDUOCR3IuPrHBy/5+oKJwLwy9hy7h0Car/6M6gI7wlx98HxvvnmRiyr9NFVnu3t4DUNzXlVQdJIWad2yJ4v0ejrWiU25bQRB+0nO5HuZ/IDuExcRhevQ3K5qey94Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=M1hOb9LCv/YaASiqgdTDb3G4/8C1/qDxqxoEGYEqugA=; b=Cz0KiiIR2KKn2RYEop4ZSi+TXqUuADNafdXTXXWJBWsy1zBZr396geDkZVYgwkzieKKxLRtaRIuLXoxbBrLLUd9cuRHTbBX8fS3GVT1ngp1v1EjjEVuYjDGswxoMEoB2J0SD9fTs+ZOF6X10MSPRyKuqiin26K3OoOubvmgTruErq5598L7II3GO1FKbUNIP8sbETS3JK/8+vc6/hLaPITiBsjN3xhVsGFDFt/7yyRMo1wFRl7+POnX9LpX2JZWkGN9acaEvhDHob7zHj8Fm14J3P3cOuqoV0ca1ival5DgjWZnI/csdFKqkAEsmb2fw7M1qcEE7GWDopMC84sfMfw== Received: from AM9P193CA0012.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::17) by AS8PR07MB9017.eurprd07.prod.outlook.com (2603:10a6:20b:536::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Tue, 4 Mar 2025 15:16:20 +0000 Received: from AM2PEPF0001C708.eurprd05.prod.outlook.com (2603:10a6:20b:21e:cafe::ed) by AM9P193CA0012.outlook.office365.com (2603:10a6:20b:21e::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.16 via Frontend Transport; Tue, 4 Mar 2025 15:16:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM2PEPF0001C708.mail.protection.outlook.com (10.167.16.196) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:19 +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 E464F24DA2; Tue, 4 Mar 2025 17:16:17 +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 06/12] tcp: rework {__,}tcp_ecn_check_ce() -> tcp_data_ecn_check() Date: Tue, 4 Mar 2025 16:16:04 +0100 Message-Id: <20250304151607.77950-7-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM2PEPF0001C708:EE_|AS8PR07MB9017:EE_ X-MS-Office365-Filtering-Correlation-Id: 82a699f8-73b4-42f9-8689-08dd5b2f8445 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|376014|7416014|36860700013|82310400026|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MOSiQ9Z4B5LlnJVnePE6yhy9Ru6eBa6?= =?utf-8?q?9cMJoZjBtDw6NKWRMmK+lVsq0oBJ5VP+hWFW+Vn7cCKMYDl50hdW4XYm/8rEAG82X?= =?utf-8?q?ni1b7UX/VmvravMp0XG/DgW3kgz+hyKhHnpmqUzGh2u1UNySLn8JXuQfa5x0Engoq?= =?utf-8?q?pGM/5isieTXuS/XhEk0spKftjoeRT+jrywhUIRx2Yx32C3ale12JW2eDnYAcSP4/h?= =?utf-8?q?Ss9i/iJmPZOeILqNEu4AK+ibOdeOhFYAbn+W17tbXYHsSXR0zDsY6NWm8MhPB1cj/?= =?utf-8?q?E6TMApnAyPg5VZ2s1Z3xFoEuTaLcOaCSqjwUMFS+hCuWQbj9wRHiwhy2rVHDLR7lq?= =?utf-8?q?Jr+3j+EOd8R5OjD6Di8pZUCmqXozqpOprj2jZNOvihUBNf+hzVV9q684+f+o+vRlY?= =?utf-8?q?Y5p72GozA7cGj/4+9wgFR3vOmYfwHT2eeCmgusqHJAjJwn9GJnvxK5BMU9T29z4fR?= =?utf-8?q?EMoAqN/9wGZXOlts1TElGSsrTNAfZaChi7ONk6qGJyEs6jzn2O1ZAScGYxOFn04XJ?= =?utf-8?q?s69eNiIpSskfHYmcajtA7fqUQx6jv6djkFkrzpDeSfmLJGFwQjScht3a5RaE0v6cL?= =?utf-8?q?fyYOPN85v5Tuox+C4g6uttFBJEyOzLN8I9TXi4A7FOu8FT5CkGXC7/0u0iOpYv90g?= =?utf-8?q?XKv4bj0jj04uOog2x7ZnoLhctX96J21DFma2nVkYKj0nAiGggSg9djWNvblR4mEn8?= =?utf-8?q?4OezFO/HjOzA1Ew7VZI2s8jJHsN9UZ3Gsr1mxtAT9ywm2Wu5y50k1f3uXYDdRgvtS?= =?utf-8?q?0CH7UwNkoGvHFLR8Z4ZSE2KAiIZtUk1aTzQa+lyVG/GO6HDAe2sf1q0HnA6auxang?= =?utf-8?q?z6PTmeGTvHr+5C0FDfoO1cS+tnnt5Kg+Cz+TImBs4poRfCWIHDgKP4cQ7MxUOiZRH?= =?utf-8?q?S3qgHbtsLI2bL4nRHbFclx+VfOt7WmsopvV5Z+w6OpVF/wAvf+fzzHGaSO4+bPujX?= =?utf-8?q?XPm4wwyTL++m8tmNoc728K0KDjQsvmObhtmm0y6k5U2LV/YRNyisTza9wM2bwoaFq?= =?utf-8?q?+OiF+Xp5Hv0jx4p62eZRvDNZH617eIbxfa6kUXbE6eoi+wnm7tMu0XyN1OI0dEsxg?= =?utf-8?q?2a29UhkHmXbET4zlBo126TwD8T8CFpCjeQSH68HDCT+ctv6BBrmAja75YgaPqCeBS?= =?utf-8?q?Jy4yolH4DnkGGiFFw9HHb42b8xK+XSc2ZpwVU109Y0ssVX0vETsODFpQoRMc91kvi?= =?utf-8?q?5QXyxRq+jasVWB6SpI1NN2kF2o7PkzdnBdSgi73dqOZyUG6ugwF3lMHFn3n+xoefU?= =?utf-8?q?I96YxgayCjwX0cRAhxQbccIsV7RY4AVag/BolGq4z+/MFmu4RvT66vFkSRJsyo7nH?= =?utf-8?q?/D1JZXHDa9tQLXcZkEGFZO8fNaVdH4qdJyETo+sefQMCxC10nGqh1ROiA+saoHcRy?= =?utf-8?q?97NubizBPWYmmkXzIZZHmxj/Fs0D27Za0lfhi4HWhPlmNmuErvzL0s3GUBMLgomip?= =?utf-8?q?ilNTQbpiiY?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(82310400026)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:19.5030 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82a699f8-73b4-42f9-8689-08dd5b2f8445 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C708.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB9017 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Rename tcp_ecn_check_ce to tcp_data_ecn_check as it is called only for data segments, not for ACKs (with AccECN, also ACKs may get ECN bits). The extra "layer" in tcp_ecn_check_ce() function just checks for ECN being enabled, that can be moved into tcp_ecn_field_check rather than having the __ variant. No functional changes. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- net/ipv4/tcp_input.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 771e075d457d..769048b559e5 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -365,10 +365,13 @@ static void tcp_ecn_withdraw_cwr(struct tcp_sock *tp) tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; } -static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) +static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb) { struct tcp_sock *tp = tcp_sk(sk); + if (!(tcp_sk(sk)->ecn_flags & TCP_ECN_OK)) + return; + switch (TCP_SKB_CB(skb)->ip_dsfield & INET_ECN_MASK) { case INET_ECN_NOT_ECT: /* Funny extension: if ECT is not set on a segment, @@ -397,12 +400,6 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) } } -static void tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) -{ - if (tcp_sk(sk)->ecn_flags & TCP_ECN_OK) - __tcp_ecn_check_ce(sk, skb); -} - static void tcp_ecn_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th) { if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || th->cwr)) @@ -874,7 +871,7 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) icsk->icsk_ack.lrcvtime = now; tcp_save_lrcv_flowlabel(sk, skb); - tcp_ecn_check_ce(sk, skb); + tcp_data_ecn_check(sk, skb); if (skb->len >= 128) tcp_grow_window(sk, skb, true); @@ -5041,7 +5038,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) bool fragstolen; tcp_save_lrcv_flowlabel(sk, skb); - tcp_ecn_check_ce(sk, skb); + tcp_data_ecn_check(sk, skb); if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP); From patchwork Tue Mar 4 15:16:05 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: 14000910 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2064.outbound.protection.outlook.com [40.107.249.64]) (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 ED1B928FFD7; Tue, 4 Mar 2025 15:16:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.249.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101387; cv=fail; b=J33ZouWsOns3jQwxLReFzEO1mvBHcXUWF+OblDs7boQb4nCiG9Kzo+Q6gl4m1i/3xTcZTH6/WkSA/VC85WAFTeVUXl5QxNv/D8VcT9dS/OfP7zW/uaLgO6UI/+HJDf15vlk7pZZtyVVgNgtVRjofTqBvBCWB/YdWqqgi+zKutZs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101387; c=relaxed/simple; bh=DS5pMf6K6WVtAf8pglKCB69Nj81sKdozzBcJ3P/6BO8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=d9/bjoTe3g9+kZbUhi5P7nu5UE07SWhxOxFHECHTYYF4xZ6kn/F/7qSfhKlldcqTIsLZLFvN+Fg/DEMNQfM+ji+XhglyR8VzlPlungKQ3P21HD3GhWgoZyq1CxX2Ciirb1wc4Pv4K3fxYvTlFxkgWh5z9xRcK81IFFYunjSl/V4= 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=HKBFgTLK; arc=fail smtp.client-ip=40.107.249.64 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="HKBFgTLK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cyIv9t/AMS9MQCt+s8xaevPlzORGRQ95JCMpG+XEt5Fn2Ml7kG0M9lWGByfUotmRFVqNBHd+A2vWFiiE23gwWePMGsQFD5APy1k4uwKyCkhZdaYy9S9J4sVuZJyu2QUwqsqHWT8N/H/zK4T6vwCSaviVDRk5tbKAyXDHrdQoghwNxfSQQ4ODo93w4IJhVMi1u0s/MFkYAUL9jKJKPtvsnBjYbAZPQujNAlHSpzs5DE4nVnwRHdR8c/nabeEecuQQD1k7wzEc0vzx14Z3fBXKkHgYhcSImw+ScrnXLla++3cnzvtK5R8JLcN3oqqWnDbNwEmcumgPCY2d0odEP9diIw== 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=1sMm9nIWAi2trJYkDq8YaqvfSyZTb5Z8cbXveLTvg+E=; b=hcP3Z65cvUEb5sIVKs7a1f3e0utEGfvwuoNGF4qhvQEs6VXdGpgSLse1ymx0B/32g9roerSWOsMMSDvpa/4zBaNVYxe5mC8AocZh+FfwN1Qql/C80mzZJ1j06z9QrxiUNdSeOb5+6cHFyjvn0v6ALefgUWZlWyb9zOygnx/jbhyBKztCDILqvgGs0nkOL0xadZ2iYStBAApZE29zDcLZxx/UILUfJ4iyp98Wo6ZS6DFteGwxPViP25VjsH3qiO94kvVrLvhq5qgUU+t6ncN9YDZv6mDk+tsUcCX1crQy27uGki85tIXidSAByU+GG5mcJDRsJrcN3PcUtqsi4K0Dcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=1sMm9nIWAi2trJYkDq8YaqvfSyZTb5Z8cbXveLTvg+E=; b=HKBFgTLKyuH0/LhbFb/KXXkYkxVJQI0C2S3ZeHBGLvA9IR1YF+P9j3Jhrpo0wXd/9m8+IScN/R8j3zHtKtCSFuwLyTvSiqgb+CaTPYI2kHk9Vs+aAJy6/h7fvQHX7zkwXFIS4XLctbtpQ9AWK0A6TldPBwhlazGeBghQE+tZ9Jfk7BHdXex5uQTwiAq9/faejUg9mx0pXXx6bT3nc/NPAYQ+vd/mw9VvBXSoGibpc5Ge5P2iW8XGGt/ryKhpz8z44CMe94oebJneL2hP0cVjvluYxwyVbU/YaAYCqM1Ts1nPLq865+HcomOxjJi22+Coy0NO8hC9DNolY6D9ikie0A== Received: from DB8P191CA0017.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:130::27) by PA4PR07MB7519.eurprd07.prod.outlook.com (2603:10a6:102:ca::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 15:16:21 +0000 Received: from DB3PEPF0000885F.eurprd02.prod.outlook.com (2603:10a6:10:130:cafe::ff) by DB8P191CA0017.outlook.office365.com (2603:10a6:10:130::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by DB3PEPF0000885F.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:21 +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 3FFA724FBD; Tue, 4 Mar 2025 17:16:19 +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 07/12] tcp: helpers for ECN mode handling Date: Tue, 4 Mar 2025 16:16:05 +0100 Message-Id: <20250304151607.77950-8-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: DB3PEPF0000885F:EE_|PA4PR07MB7519:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cadedda-4788-484c-a158-08dd5b2f8519 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|7416014|1800799024|376014|36860700013|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ZHlZ2XEc1FIJBy3DIjWr5BRzrhqLyHY?= =?utf-8?q?QQVwS4vNQjGLeXiZsSHqa5VwMAjN0mkjmoDLLktoRRSy/Kxn87k0+Ta6Rw1Fdovre?= =?utf-8?q?IExPfrWebHo5m19/ISNyqIU6nsMQO8HZJVISonLIDoUjny1A59/nZt+5kzaPb8PsC?= =?utf-8?q?oW7LqXsnBiY1kpl07kDe1cStBQK+Ow4LPI8P9k332vMXeKKj1riE79GLF/7VnH6Tt?= =?utf-8?q?d3oCtc7If9advxp4+NSliOve+/nd4keK342UhthWqDi8Fs8mChseJhebk33EwQEKd?= =?utf-8?q?YyemHcCBHXZ2780/nuD1+DfmomnWz49/0MwSgqeRnU+1my/fcciWqWx8mLIMGdMC9?= =?utf-8?q?/RInUOq5bhk2sFB7015uJYCttCs+zf+cxm2qeQSJMDuB+dW8wyrT1hZ7iJN0IUnqm?= =?utf-8?q?t8Zo1+agG//5oFdgDhcedXXs6z8OQzDYBPxTHY0uLawlapoFGLPmR6eemwSYZIpE4?= =?utf-8?q?YBrUp3ttL6een5dmqDwFDt4X8FSBEJjGV2n1NQzv3q8GIoa/fjtwf1fGRo5yVmYTN?= =?utf-8?q?19XUKsO6HC/cUNFtI+Y3VxUAskQyQrkdFMEs7VJt3k2LcnRiCd5eikdGFpp0TgjDj?= =?utf-8?q?TLKQqkF/NG61+AYEmGQNgtcn7BBepKx82jPd19LAB4uI/m0eVuSKyRtDsgGIbaiD9?= =?utf-8?q?AcmZ790hTZwH9O+S+PkBbXL0FSGy8mGU1GjlroFo7uw9lTIE1KhjfrieT/U9v9pvk?= =?utf-8?q?B5MUZ8HBOtldxrDKJQvDUlgtt6RxWmYR0qd+QC9mS9CukDIEt+ibYPzDOg2eadNoC?= =?utf-8?q?f/oRxMRbXcxOgASEVRf95F14kPDX4m3nQiY/zdxFV8pvdagy4vIG4ZANPjRDkK7TH?= =?utf-8?q?xD4twIVs9wKN0lvU4C8FsJb7Cbs0AYg9ntoRdMyvJ4me1BywCdii+r4eYWqylMvcR?= =?utf-8?q?czLNQfMISfNmWpm8P+ji7dfI8vGqAqaNYwaVYWYZQdNz0/b/AOs2q/rH1nNFRqXCh?= =?utf-8?q?FYARwgth550IUzl0u3EybFQ96WVy/ghXIz93Gqj86Qy8qV7pDRiyQbGaKn2v35MI5?= =?utf-8?q?Rdi+xjPLYp2efa5vy1YP7fjMqfa/MyHAIAtYspUO4BHXbiCQw0ofXXoTh/rtgLbMQ?= =?utf-8?q?+dpinnqW59ioJ404/A+Noxz1Ro2zN6Vv1JkTMRxRj9ZIc6Ol5cTQSE80J6J48oKLs?= =?utf-8?q?Do22L0W0rFYarb5ReWJCH0NwUeKDFiP0/wfuMbzkeNeNh5L7DNbokWkledvbdzPhA?= =?utf-8?q?sAxD+rd3ONO575e2WCUYqBCAdWiPup7zlRqPM0HpkH6a4IJx6n0CXvT/5t/JpGM8o?= =?utf-8?q?wdhp7FxRJ2y58javmUtMOVd9y1OqMA+Xznqpu5ymm8lMe7GnkwoW7l0q7C9DA+2Nm?= =?utf-8?q?n56M4I5qAUCIATbAA7kyPSEtfanouI3QefHLHe8qHIbeWNOAdE7lEH6jeKHJo0BNy?= =?utf-8?q?MXkE2l+3xk6nB5Lh2aNp+4BR1aFOBsKUQEZCTMPMUej9zPMzJq5zg2hTFdoz0Gj/j?= =?utf-8?q?t9FNLDCiMV?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(1800799024)(376014)(36860700013)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:21.0026 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4cadedda-4788-484c-a158-08dd5b2f8519 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: DB3PEPF0000885F.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR07MB7519 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Create helpers for TCP ECN modes. No functional changes. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- include/net/tcp.h | 44 ++++++++++++++++++++++++++++++++++++---- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_dctcp.c | 2 +- net/ipv4/tcp_input.c | 14 ++++++------- net/ipv4/tcp_minisocks.c | 4 +++- net/ipv4/tcp_output.c | 6 +++--- 6 files changed, 55 insertions(+), 17 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 49b66b499429..7e553f27c0e9 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -374,10 +374,46 @@ static inline void tcp_dec_quickack_mode(struct sock *sk) } } -#define TCP_ECN_OK 1 -#define TCP_ECN_QUEUE_CWR 2 -#define TCP_ECN_DEMAND_CWR 4 -#define TCP_ECN_SEEN 8 +#define TCP_ECN_MODE_RFC3168 BIT(0) +#define TCP_ECN_QUEUE_CWR BIT(1) +#define TCP_ECN_DEMAND_CWR BIT(2) +#define TCP_ECN_SEEN BIT(3) +#define TCP_ECN_MODE_ACCECN BIT(4) + +#define TCP_ECN_DISABLED 0 +#define TCP_ECN_MODE_PENDING (TCP_ECN_MODE_RFC3168 | TCP_ECN_MODE_ACCECN) +#define TCP_ECN_MODE_ANY (TCP_ECN_MODE_RFC3168 | TCP_ECN_MODE_ACCECN) + +static inline bool tcp_ecn_mode_any(const struct tcp_sock *tp) +{ + return tp->ecn_flags & TCP_ECN_MODE_ANY; +} + +static inline bool tcp_ecn_mode_rfc3168(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_ANY) == TCP_ECN_MODE_RFC3168; +} + +static inline bool tcp_ecn_mode_accecn(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_ANY) == TCP_ECN_MODE_ACCECN; +} + +static inline bool tcp_ecn_disabled(const struct tcp_sock *tp) +{ + return !tcp_ecn_mode_any(tp); +} + +static inline bool tcp_ecn_mode_pending(const struct tcp_sock *tp) +{ + return (tp->ecn_flags & TCP_ECN_MODE_PENDING) == TCP_ECN_MODE_PENDING; +} + +static inline void tcp_ecn_mode_set(struct tcp_sock *tp, u8 mode) +{ + tp->ecn_flags &= ~TCP_ECN_MODE_ANY; + tp->ecn_flags |= mode; +} enum tcp_tw_status { TCP_TW_SUCCESS = 0, diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index eb5a60c7a9cc..aa2141aef15d 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4138,7 +4138,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) info->tcpi_rcv_wscale = tp->rx_opt.rcv_wscale; } - if (tp->ecn_flags & TCP_ECN_OK) + if (tcp_ecn_mode_any(tp)) info->tcpi_options |= TCPI_OPT_ECN; if (tp->ecn_flags & TCP_ECN_SEEN) info->tcpi_options |= TCPI_OPT_ECN_SEEN; diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c index 8a45a4aea933..03abe0848420 100644 --- a/net/ipv4/tcp_dctcp.c +++ b/net/ipv4/tcp_dctcp.c @@ -90,7 +90,7 @@ __bpf_kfunc static void dctcp_init(struct sock *sk) { const struct tcp_sock *tp = tcp_sk(sk); - if ((tp->ecn_flags & TCP_ECN_OK) || + if (tcp_ecn_mode_any(tp) || (sk->sk_state == TCP_LISTEN || sk->sk_state == TCP_CLOSE)) { struct dctcp *ca = inet_csk_ca(sk); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 769048b559e5..5c270cf96678 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -342,7 +342,7 @@ static bool tcp_in_quickack_mode(struct sock *sk) static void tcp_ecn_queue_cwr(struct tcp_sock *tp) { - if (tp->ecn_flags & TCP_ECN_OK) + if (tcp_ecn_mode_rfc3168(tp)) tp->ecn_flags |= TCP_ECN_QUEUE_CWR; } @@ -369,7 +369,7 @@ static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb) { struct tcp_sock *tp = tcp_sk(sk); - if (!(tcp_sk(sk)->ecn_flags & TCP_ECN_OK)) + if (tcp_ecn_disabled(tp)) return; switch (TCP_SKB_CB(skb)->ip_dsfield & INET_ECN_MASK) { @@ -402,19 +402,19 @@ static void tcp_data_ecn_check(struct sock *sk, const struct sk_buff *skb) static void tcp_ecn_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th) { - if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || th->cwr)) - tp->ecn_flags &= ~TCP_ECN_OK; + if (tcp_ecn_mode_rfc3168(tp) && (!th->ece || th->cwr)) + tcp_ecn_mode_set(tp, TCP_ECN_DISABLED); } static void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th) { - if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || !th->cwr)) - tp->ecn_flags &= ~TCP_ECN_OK; + if (tcp_ecn_mode_rfc3168(tp) && (!th->ece || !th->cwr)) + tcp_ecn_mode_set(tp, TCP_ECN_DISABLED); } static bool tcp_ecn_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr *th) { - if (th->ece && !th->syn && (tp->ecn_flags & TCP_ECN_OK)) + if (th->ece && !th->syn && tcp_ecn_mode_rfc3168(tp)) return true; return false; } diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 3cb8f281186b..0ae24add155b 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -461,7 +461,9 @@ void tcp_openreq_init_rwin(struct request_sock *req, static void tcp_ecn_openreq_child(struct tcp_sock *tp, const struct request_sock *req) { - tp->ecn_flags = inet_rsk(req)->ecn_ok ? TCP_ECN_OK : 0; + tcp_ecn_mode_set(tp, inet_rsk(req)->ecn_ok ? + TCP_ECN_MODE_RFC3168 : + TCP_ECN_DISABLED); } void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 98f2684e0006..0d275ee68a1a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -325,7 +325,7 @@ static void tcp_ecn_send_synack(struct sock *sk, struct sk_buff *skb) const struct tcp_sock *tp = tcp_sk(sk); TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_CWR; - if (!(tp->ecn_flags & TCP_ECN_OK)) + if (tcp_ecn_disabled(tp)) TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_ECE; else if (tcp_ca_needs_ecn(sk) || tcp_bpf_ca_needs_ecn(sk)) @@ -354,7 +354,7 @@ static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb) INET_ECN_xmit(sk); TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ECE | TCPHDR_CWR; - tp->ecn_flags = TCP_ECN_OK; + tcp_ecn_mode_set(tp, TCP_ECN_MODE_RFC3168); } } @@ -382,7 +382,7 @@ static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb, { struct tcp_sock *tp = tcp_sk(sk); - if (tp->ecn_flags & TCP_ECN_OK) { + if (tcp_ecn_mode_rfc3168(tp)) { /* Not-retransmitted data segment: set ECT and inject CWR. */ if (skb->len != tcp_header_len && !before(TCP_SKB_CB(skb)->seq, tp->snd_nxt)) { From patchwork Tue Mar 4 15:16:06 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: 14000909 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2040.outbound.protection.outlook.com [40.107.21.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 366D328FFC2; Tue, 4 Mar 2025 15:16:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101387; cv=fail; b=gohmxq8uMJOOc1tWX4Y0UQ44FCO9nicLQXjFIrlBKMEGhk5QUEsLwG4/ks92MqYFK8o/kHTr5R+bH70Zv5sgzMzRBDQWnlUMsa/RU03/uxq6GSLCGXbDLfxjnyWRM4lz2MaPeZYQ4KSm4Tjq6g4smhO/lvKq+ZbysJsgZW4mjiE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101387; c=relaxed/simple; bh=O3ZZ+hEDmoX6MlL7QX+4VLaPlkgdXaFjCXddHHveQjo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=oCdtSHkXmqwxCbs1lYSK61UWoh6aibcue8gEKQivU7sN4zEe/ec7ui47b99jISt+btZomaBAuCUWTVPkIpDtvT8S9rJRq11uAjQ9FPIrwrZ9TbHKWRbZTl88aXAgzGATV6sUHYWPlciBacdDAYSsKrCuS8yr06RAI3jL3rE08sY= 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=dAO79+lh; arc=fail smtp.client-ip=40.107.21.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="dAO79+lh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VlQdbtf4qAyrgRk6QnuSwzWvEALUCBxdlRa8LY/S2/HBop8KC3JLse6FofpNApHhUYIqXrwKsXqSQE+zmppCfAGJJTweR42lsNlcvqPbLD3cuxzUHFLRkTArm3CjyxRu7jmJWDQkT5DOCWUWZYpvcE1e0mlzjNMiBmzHApp2k68vam9uH/oA2lKL9qVUoKLSpC6/mT/WaCXegTAhCna4dJEV70yFZox/s2lQAahFFVh/4srZQfM0EyB0pjltp8w8BscQ9G0Lc4RbgDyBhOUNG9QFPHtADNMZXDWSEj3EyuyDhq2oojQ9cZi0x3UUpIALpUZL1lR9GwtKPT4lwDs/GQ== 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=KlcC8lqloYr+wc5Uzrisp7seX+Nc18fIeGDKA8wt4XI=; b=Xy4c3pWssHbYjDfJDg85/K7ek0BP1KCNKbBLvEn3YgVg5oA6/r48jXNfEBCz4hRpjAanii/obkuztn7BvAT31xAkbx9XGtVLbV9YbP+EWkta64ccl6OUOOEpnep/MGnj3nSkTvmEawH6nWaNu39Zk+abkrOdSBR9ZVG8IOoQ1LoN66ltP8bR1bw9HQsRm/mv8ddos/E8H/DjwShyqsIK+P/Up1gxJ+Svm0GmIW3ZiTcn4zxVZAaPCkdR+H5800JIqxUpA78+ZgX9Krs5q1c9MiGcXbQwWk70fUH44R04uWBxaVdB5Ao6BMARFo84tWod0iZySYn5kb8/e1u8teNZig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=KlcC8lqloYr+wc5Uzrisp7seX+Nc18fIeGDKA8wt4XI=; b=dAO79+lhQuujWfRx4ApeWDHaTLpi/t+7+8moGa6Qnck4vSXNssi//8EzakXeZn5qlkTVkHByAhWOGQsEkWPWheca4UdvAEWFjpYpFGGeOD4AtFs1/LbA1oKuBR8cf8hmnP2I09OibusNM732+4lJlf2S6m7w+2TA31D3hx4lAETu0c37tPTaffeYiA13L4gsIZhTBDrKZUgpolIScZK5PZrTWyW2uYi2S4OXv4jihg2mYOBkiu5Awas6laE7Uzuf7/2ehV+9kHVoq3I+rBeSw43QakWjwjUbEBCNE/wS9wAQifBJu82ZvfpZEnV+FHiynFVdo0I5yJ/irG64bCceGw== Received: from AM9P193CA0014.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::19) by PR3PR07MB6809.eurprd07.prod.outlook.com (2603:10a6:102:7f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Tue, 4 Mar 2025 15:16:22 +0000 Received: from AM2PEPF0001C708.eurprd05.prod.outlook.com (2603:10a6:20b:21e:cafe::3a) by AM9P193CA0014.outlook.office365.com (2603:10a6:20b:21e::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM2PEPF0001C708.mail.protection.outlook.com (10.167.16.196) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:22 +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 8FF7C24DCE; Tue, 4 Mar 2025 17:16:20 +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 08/12] gso: AccECN support Date: Tue, 4 Mar 2025 16:16:06 +0100 Message-Id: <20250304151607.77950-9-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM2PEPF0001C708:EE_|PR3PR07MB6809:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e2886a2-230e-4aed-38d7-08dd5b2f85dd 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|376014|7416014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ATA5Xi90O0cwtVOPe3cUIN9zIOVCaY7?= =?utf-8?q?18edgdWwo3yOb2Rf6aC5q1ffPAV36QhenYLEBjcFRx94IZTlJ25TcfSfJ/O5l+Wcf?= =?utf-8?q?r8Ie3UilbuR9qVEvqGmq+U3aJ0yR7mtMIapWeIyvHlsUTLGMEa2TaAE0nyq1Tc9XF?= =?utf-8?q?Qa5D2fWaktkBcbYbCjNAzDIqvjSbU+SlZDkQXljdwqjUSAuhvuJwKU3+j1vZlcrRi?= =?utf-8?q?llsrqATuwuMx2Umrk8tD6MvMWlfhgqjvR3IQO9lpVANUwdeo6vBShMkjUQbXIc/pD?= =?utf-8?q?ssO7lq3FHWNrVxTKQLoDCdweccRp+JlIMiUsoVf9jhEcKvtStp2V4xWb3xBI9tj2d?= =?utf-8?q?SPrVom1NPhSOI6fw0M/rbFxvEGekYn9z545bfGYs2b3E467r4BId03rGK2t2LEfq7?= =?utf-8?q?liZ85k5IwgwuOReMLhOGeXh1FzH37NXN7/BW70w1+aRN9ILHsCVn1dZFVgEnSIrVw?= =?utf-8?q?r01DQ0ESDWEoJ3gYNdCqTVsGgNNRPuOqWy4Zdxo6IAU6IQQXYgBb7hACJbOttiVLn?= =?utf-8?q?n9tBa3CKWZK/3j9VgExMtQnjRlNiKZRvmDh0H9HnD403g3Uksf4QFzf/AP9hEBXSe?= =?utf-8?q?eVWQZL+5l9EQHYWL5vT6oEtyl/KfZFXN5nD03bjRw3LyOkjMM5PTksfW9pmCirJin?= =?utf-8?q?CvOVFUvllS4mbBMaJH8ZnuDA9t+RiiNNE5zTEAT1nqkFEsXbCpjy8YUTUWU22QVYR?= =?utf-8?q?GAR2/ZAny1xdhCL9dm6Nk7Gqo0ivh5VWd/zhG2XVEjNEg1PlQs0+k7jNPxqONCq9N?= =?utf-8?q?i2g++Dg8RFnmMeRShuK2y5HDDY9mBs2IT1c7jCeQPLKvIz6UN59fwC84VkwNKo0Np?= =?utf-8?q?AqwrLh3p1hhDRtEzY9NXu/LfO/nh28AvJlcpJSqVehL4UBoggGwnkBkBx5+mUbcbV?= =?utf-8?q?zTU/AphoQD0BqLRGmeNvZHQb6bqL6TDQzL0o/dZouTrKrxDUOIUD9Ns2GxeVnO2Fv?= =?utf-8?q?JzjexKltPi/SxXhpUvexD+V+kBoLewCVL2FXRlIpZ/JNKFaYbbkxZ3oFcAa2Nf7b+?= =?utf-8?q?86y63tUJpEE/lHxd3N5D1XuP9a1urCLjYGkeYTIQ4aL10sdk8Mi3J9N5QIwUTglbA?= =?utf-8?q?iE5oyiYb98Zp6+qnN1xUp52DdHao6uGllutgLNcw/U7fcgJWYJhEmBBSzPC55tgDG?= =?utf-8?q?oSkbUa9ZIMBGmEWk6NcbXs3rhdBZmirwgllt2Fqdd08K/KCMiZtozRo2zsKp+Hv+I?= =?utf-8?q?xOZ0cfuHECGqkSZ55UUBEULKLOIIQx1IoK0URu3OKhJmdjZjXzLhx3vcEfm1F7MZR?= =?utf-8?q?icSFSMUozzUQXgiR9rKTajpzt/ExZVxzW8fzx+xAEPnZR2uv59RRxPFq5HWmzTNkN?= =?utf-8?q?vHv9dzRcXqLzxBzdJLfyqzkvrHIP+jr9PSWbQuI6vCciDTAUlOUVl/ly3iGNCkVTe?= =?utf-8?q?FcetMFivNcWMGRQ5NwxFyvK1ennU3pvWLXvijvuC1UC+jp7n2EnCtI=3D?= X-Forefront-Antispam-Report: CIP:131.228.2.29;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0735.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014)(7416014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:22.3155 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e2886a2-230e-4aed-38d7-08dd5b2f85dd 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C708.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB6809 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Handling the CWR flag differs between RFC 3168 ECN and AccECN. With RFC 3168 ECN aware TSO (NETIF_F_TSO_ECN) CWR flag is cleared starting from 2nd segment which is incompatible how AccECN handles the CWR flag. Such super-segments are indicated by SKB_GSO_TCP_ECN. With AccECN, CWR flag (or more accurately, the ACE field that also includes ECE & AE flags) changes only when new packet(s) with CE mark arrives so the flag should not be changed within a super-skb. The new skb/feature flags are necessary to prevent such TSO engines corrupting AccECN ACE counters by clearing the CWR flag (if the CWR handling feature cannot be turned off). If NIC is completely unaware of RFC3168 ECN (doesn't support NETIF_F_TSO_ECN) or its TSO engine can be set to not touch CWR flag despite supporting also NETIF_F_TSO_ECN, TSO could be safely used with AccECN on such NIC. This should be evaluated per NIC basis (not done in this patch series for any NICs). For the cases, where TSO cannot keep its hands off the CWR flag, a GSO fallback is provided by this patch. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang Reviewed-by: Eric Dumazet --- include/linux/netdev_features.h | 8 +++++--- include/linux/netdevice.h | 2 ++ include/linux/skbuff.h | 2 ++ net/ethtool/common.c | 1 + net/ipv4/tcp_offload.c | 6 +++++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index 11be70a7929f..7a01c518e573 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -53,12 +53,12 @@ enum { NETIF_F_GSO_UDP_BIT, /* ... UFO, deprecated except tuntap */ NETIF_F_GSO_UDP_L4_BIT, /* ... UDP payload GSO (not UFO) */ NETIF_F_GSO_FRAGLIST_BIT, /* ... Fraglist GSO */ + NETIF_F_GSO_ACCECN_BIT, /* TCP AccECN w/ TSO (no clear CWR) */ /**/NETIF_F_GSO_LAST = /* last bit, see GSO_MASK */ - NETIF_F_GSO_FRAGLIST_BIT, + NETIF_F_GSO_ACCECN_BIT, NETIF_F_FCOE_CRC_BIT, /* FCoE CRC32 */ NETIF_F_SCTP_CRC_BIT, /* SCTP checksum offload */ - __UNUSED_NETIF_F_37, NETIF_F_NTUPLE_BIT, /* N-tuple filters supported */ NETIF_F_RXHASH_BIT, /* Receive hashing offload */ NETIF_F_RXCSUM_BIT, /* Receive checksumming offload */ @@ -128,6 +128,7 @@ enum { #define NETIF_F_SG __NETIF_F(SG) #define NETIF_F_TSO6 __NETIF_F(TSO6) #define NETIF_F_TSO_ECN __NETIF_F(TSO_ECN) +#define NETIF_F_GSO_ACCECN __NETIF_F(GSO_ACCECN) #define NETIF_F_TSO __NETIF_F(TSO) #define NETIF_F_VLAN_CHALLENGED __NETIF_F(VLAN_CHALLENGED) #define NETIF_F_RXFCS __NETIF_F(RXFCS) @@ -210,7 +211,8 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) NETIF_F_TSO_ECN | NETIF_F_TSO_MANGLEID) /* List of features with software fallbacks. */ -#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP | \ +#define NETIF_F_GSO_SOFTWARE (NETIF_F_ALL_TSO | \ + NETIF_F_GSO_ACCECN | NETIF_F_GSO_SCTP | \ NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST) /* diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 15d83d89ae70..6ce7ff453774 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -5279,6 +5279,8 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) BUILD_BUG_ON(SKB_GSO_UDP != (NETIF_F_GSO_UDP >> NETIF_F_GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_UDP_L4 != (NETIF_F_GSO_UDP_L4 >> NETIF_F_GSO_SHIFT)); BUILD_BUG_ON(SKB_GSO_FRAGLIST != (NETIF_F_GSO_FRAGLIST >> NETIF_F_GSO_SHIFT)); + BUILD_BUG_ON(SKB_GSO_TCP_ACCECN != + (NETIF_F_GSO_ACCECN >> NETIF_F_GSO_SHIFT)); return (features & feature) == feature; } diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 14517e95a46c..b8a1343d6785 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -708,6 +708,8 @@ enum { SKB_GSO_UDP_L4 = 1 << 17, SKB_GSO_FRAGLIST = 1 << 18, + + SKB_GSO_TCP_ACCECN = 1 << 19, }; #if BITS_PER_LONG > 32 diff --git a/net/ethtool/common.c b/net/ethtool/common.c index ac8b6107863e..1c6f2a2f1871 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -36,6 +36,7 @@ const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = { [NETIF_F_TSO_BIT] = "tx-tcp-segmentation", [NETIF_F_GSO_ROBUST_BIT] = "tx-gso-robust", [NETIF_F_TSO_ECN_BIT] = "tx-tcp-ecn-segmentation", + [NETIF_F_GSO_ACCECN_BIT] = "tx-tcp-accecn-segmentation", [NETIF_F_TSO_MANGLEID_BIT] = "tx-tcp-mangleid-segmentation", [NETIF_F_TSO6_BIT] = "tx-tcp6-segmentation", [NETIF_F_FSO_BIT] = "tx-fcoe-segmentation", diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index ecef16c58c07..a4cea85288ff 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -139,6 +139,7 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, struct sk_buff *gso_skb = skb; __sum16 newcheck; bool ooo_okay, copy_destructor; + bool ecn_cwr_mask; __wsum delta; th = tcp_hdr(skb); @@ -198,6 +199,8 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, newcheck = ~csum_fold(csum_add(csum_unfold(th->check), delta)); + ecn_cwr_mask = !!(skb_shinfo(gso_skb)->gso_type & SKB_GSO_TCP_ACCECN); + while (skb->next) { th->fin = th->psh = 0; th->check = newcheck; @@ -217,7 +220,8 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, th = tcp_hdr(skb); th->seq = htonl(seq); - th->cwr = 0; + + th->cwr &= ecn_cwr_mask; } /* Following permits TCP Small Queues to work well with GSO : From patchwork Tue Mar 4 15:16:07 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: 14000911 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2044.outbound.protection.outlook.com [40.107.241.44]) (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 71F99290BAB; Tue, 4 Mar 2025 15:16:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.241.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101390; cv=fail; b=jsznK4BG8GXuhHx5vk1dCLy/ya18P7n4z6BoXMikKHwtvuOVZJg1IVx2t/Ex5PCnTDZ77xspQ7HOnzrn4LRZ+N7ToU5nYQSxxuJdzhbRQ793dX1kEHYfp9drF8JnNJIXS1Fv5XVIJ3Ttx8MZqIVZ9D4/N1eJURMlwLDQpOn264w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741101390; c=relaxed/simple; bh=3RdkqonsChfPG7hBRM7hh41Onpxs6JOlUNvjb73ogq4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=FShlyv3Gj7NnEblc1gXnmYuOsYdlcA7NJM1pcgWfgEyYh6x1z4QSjdB2XXmWMGahBOS6P0zm8yCyqZIk+xOUvs5Gb436y53j+EBioA3uQ5gGHP6rbbj9B7grZdz8ccgbXECsACZXA18zCop5aJJSuQmqmUg9LCLFXfCMBu+wRn4= 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=pSILdxQK; arc=fail smtp.client-ip=40.107.241.44 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="pSILdxQK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nCBkfnoFdUno92ZoO/2pr9WSviUc56XigZ1jR5ka2lA5WLaA+L1d5Ls57gkDsDJFI4sIXmZqvQyowoDUXfbQfo5p3R2/r/lewKQdZ4dbwyDERF55pQMhcGeU/mA09sqk5KUUz3raumNFjlLzWp7REaeoytjM+7j0L1/iC9H33QYR2xdOubMnTnaKqgk5ZTSHo+Cq8wcrf8pbb57cpb6lNvrP9R2Dz/d93ZAhSXT9WmpzpOpYSH9geMqVbVgo7n234ST1nuijYYDcf8sTBeyR46cqD867enYXT2pMbepewYYtgIDEK/l5x5oqkDfkrGd72TqxLigGybpgByXo2aUtOg== 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=wKrlzno0YCh/lOjvTyktTr1XKxpY+DGvH39/XNQmcYc=; b=ROz9JaYFkGRTzaE1TzeKU8oIWdNNJHdQUS+cw9eEHG/FXnMD+I9Rlshd7LCqtH0Rzuk+afX4GgQWNtnC5+hTeHeDOT7SoCZoF7PY1zDt0fZUWvMisCJjC5jWcMRcF5Lsib5VCqa2ouFH4hrPl0qsiBVHD7rr7/wShoBsVGVl8gXSaZK2PniW+NV91TTPw8JT79IKExG3NUNCKfRd/mMxD58EOIR1KnmlsmHNGXQRxWpbtNF5YVMTwVoPqJkZuieltn3zzc4RcYbQlJmP45hWSPRpTFi5cgTiJYOqW3RNJz6JAom42zp/nnpr3u0EmiEwxTOh2OQFqULVEUsUsA4ONg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.29) 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=wKrlzno0YCh/lOjvTyktTr1XKxpY+DGvH39/XNQmcYc=; b=pSILdxQK8S7/xZrWOu0BU+wQ/3+KoTSOnnOFhSJUQgNi20gpXUoP8+55BNBTPvZ65ryBZ9MzEJ+tTbgOQxnuNR/EsmqYENNEwn80KYi52vWdfqnj6j8kJ9VqzYdaYNaMzSDcxK9t3TZJuPuo1fR5gGpoKnW/5mgJ+Is8FEvKUV25kRimQdIDk5413Uk8o2R8yIf2dpLIK2j/BHrfxITo1FY/vP75797y1amZ5r4VydLjkMszt6kcBwzdt+MqjlHVVmkLqGFS5gIwEr0DbwtY6voc0YT4Z4IqrQ7vCeCDg/DzTM50OI9qSxwhQNS4hx3CFLHy6VZeCgj8XageMcWz5A== Received: from AS4P195CA0038.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:65a::21) by VI1PR07MB6510.eurprd07.prod.outlook.com (2603:10a6:800:18a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.23; Tue, 4 Mar 2025 15:16:24 +0000 Received: from AM3PEPF0000A79C.eurprd04.prod.outlook.com (2603:10a6:20b:65a:cafe::2) by AS4P195CA0038.outlook.office365.com (2603:10a6:20b:65a::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 15:16:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.29) 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.29 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.29; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AM3PEPF0000A79C.mail.protection.outlook.com (10.167.16.107) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 15:16:23 +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 E29FF24FD2; Tue, 4 Mar 2025 17:16:21 +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 09/12] gro: prevent ACE field corruption & better AccECN handling Date: Tue, 4 Mar 2025 16:16:07 +0100 Message-Id: <20250304151607.77950-10-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304151607.77950-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304151607.77950-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: AM3PEPF0000A79C:EE_|VI1PR07MB6510:EE_ X-MS-Office365-Filtering-Correlation-Id: b08c362e-7611-42e0-a09d-08dd5b2f8691 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?jQIWRDJNu4+caHTAj+p657BNQY5qudY?= =?utf-8?q?gWzC/RA/8/FCrvo7fT5gvxB8xfrvkCcdEox4DJeh5rQ6LRiVm9/Dsfc5FQ3IXoTNh?= =?utf-8?q?8SgsxSF3drIDVd3esNrYXYnZyliLSkMq9hdW69rFiNyVOaZqTaGc/KWCM7vBFWfzH?= =?utf-8?q?2Zx68mnyB/W2aY9G4T2oyuqfSAd626iVeXwqQiCvt/aE8yyT21aX2uvUkIVJR6gMB?= =?utf-8?q?sjAeLRaa5MapiAGKhT8egiU8ZGwi/K14YMSZ96wJSr0XtNymdaQnXEHdVB65SQg1i?= =?utf-8?q?s63sOsxD7ASk1aQoahxdaarBL+rt/cBEsbKTOr3P07PVSMaWdjXA9jB3jx1aUk577?= =?utf-8?q?MDMvngTYnVlYevaQNO4q9l7UojCs1cE0mivriM96FXkGTAddEwB0OG6jdD9N9aDtt?= =?utf-8?q?T+C0ZZZ/zEQXqeWpr/LhuEZ+5PP5UBvEcxLmaZxbrWxrdTeopNlGVcWhgcxZOZCiJ?= =?utf-8?q?JyXBVxBFcsVmYuPRyMrqCCL786cofsedaw+c/TVt8mm+0C3ybDf20/T+Ykmg2z/+l?= =?utf-8?q?kSrHC456deW31q1mmvSC6xJ9vBI2dDRwVNnc/6zwBfMdb7tNB1KEJ5uO/pQd8Pfhi?= =?utf-8?q?bzRfthd/mdrwAhosfbR1/2EFqreYAqHAxLT0hjp3aq8Fu2WEn14viFoeaUfR72Nfy?= =?utf-8?q?jadh2UqBkhBs451zCuOhgXGUGCPGnAHeTvZMKuVYijBq503gpRsa6suqdw9vDGqZ7?= =?utf-8?q?oNUY2MyXUGkWd22T2Lirfv/nfOuX3gCHfpMYe3m0iccl6d7kUXECPevqqcS2io5v9?= =?utf-8?q?GvXNI2zVsVkkQqjTSHVDCMETCxaFWxsRiyANz/NwP3Gp1QZW+JJeAGvL//CyudC+A?= =?utf-8?q?ZWK41/cbQr1W+KQlDFjMz6ZcQbkRsNr+apHX+A84OlqoDnu6U6pEdWWzXBI0+JBUc?= =?utf-8?q?McteuTE+8c/2+8gn+bjwydCcMZVUW7tDZeBGkcdrdYbYM+XU2oueYuAD+0GQY5k7Q?= =?utf-8?q?vU0m6YVMWtJDwNvGDJi4/QIiaaII3HwDvKD5NvKGM0V/sI7uDfJiDrcLM/Lik+AGS?= =?utf-8?q?eEdIQwgD6o14UNd3v4oL/oSmmKyPkBOR6OKs0rZWCczxpVdom85LShTHx+FQpKCtI?= =?utf-8?q?XVZ2A37qtUu5G7bBd2suQqloKrM1iehH7LQrb5+rdQORF2/8tMtEruvGGkzUM0S6J?= =?utf-8?q?pL4qqVUwbvdbyVdV7e1p9ktimdVQKCiuJeIyjuT9pNzny2i0XGavCCiP2EmmsFIaa?= =?utf-8?q?LiuLeW/gQQvekLoZcOcJL8AW+INZs2qNllezPO5/rcc7euM6jY4RYN5SmhPUa5z3G?= =?utf-8?q?EbNu2tWdwP4yDxuY5+zV2d1qDpS4cFUsiKRAzujH/cG99egLANDfv0PWmyr0THESK?= =?utf-8?q?2cw2JpZLqePOd+Q3rS9A591Ng+EyW6N7BYc41Wn/G9NceZA2hAo3omN/cbeqelIJb?= =?utf-8?q?c0zbQiKBo2yhptbqGqcxLfYe5eWsJit58rMjd1LygkL6vEn8cwnk+Em/tmx2oJrgb?= =?utf-8?q?MZHALjEt0x?= X-Forefront-Antispam-Report: CIP:131.228.2.29;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)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 15:16:23.4978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b08c362e-7611-42e0-a09d-08dd5b2f8691 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.29];Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A79C.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6510 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen There are important differences in how the CWR field behaves in RFC3168 and AccECN. With AccECN, CWR flag is part of the ACE counter and its changes are important so adjust the flags changed mask accordingly. Also, if CWR is there, set the Accurate ECN GSO flag to avoid corrupting CWR flag somewhere. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index a4cea85288ff..ef12aee5deb4 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -329,7 +329,7 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb, th2 = tcp_hdr(p); flush = (__force int)(flags & TCP_FLAG_CWR); flush |= (__force int)((flags ^ tcp_flag_word(th2)) & - ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); + ~(TCP_FLAG_FIN | TCP_FLAG_PSH)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4) flush |= *(u32 *)((u8 *)th + i) ^ @@ -405,7 +405,7 @@ void tcp_gro_complete(struct sk_buff *skb) shinfo->gso_segs = NAPI_GRO_CB(skb)->count; if (th->cwr) - shinfo->gso_type |= SKB_GSO_TCP_ECN; + shinfo->gso_type |= SKB_GSO_TCP_ACCECN; } EXPORT_SYMBOL(tcp_gro_complete);