From patchwork Tue Oct 15 10:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Chia-Yu Chang (Nokia)" X-Patchwork-Id: 13836073 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2048.outbound.protection.outlook.com [40.107.104.48]) (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 7D1321E7674 for ; Tue, 15 Oct 2024 10:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.104.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988225; cv=fail; b=h4AGW1c6i6eT8xUM6bG3KxRDTHggg7aj0HEHuAvkkKhax54+ClsDz7E6BR7WHL/H6yghOs0DD0pIM6bkePaHwA621T6bSafuqoDk7HVo7F5MssT9CpTA6WEy+7mePn8xULvtfmjGYP4gYjvD28LkqxcNWePKJFnlNQ0pfb8HHAY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728988225; c=relaxed/simple; bh=Hj0kpmxspiVLJX8wpFuphNG9SkyVLpob5NDj2PecjNo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Y9WQoq//8bBtngKgCEXnU2yUgxjiEQ6ZkCY2aQFFvsrvxdQ2g+PG/INx5jITwHArgOfaxDNms0t/Yoi8hb+4xc8RV1DN7aQL7Y1tHh7L2WNuYVYxM/AiQbhmJsLHUQXTiEMbf/O2U13m9V/3I66I+5MP3qVzfg3eQhT7yCXsNKA= 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=D+L0NBTL; arc=fail smtp.client-ip=40.107.104.48 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="D+L0NBTL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c70vXfmcIObNEnM3wzPWtM2lxa8QnbfgZMCp7bVdlPcoP9Yf5uEAm19/OI0cqHTXQFG34UOawUNKehjmwbKBfedF2Tplbvecxv5bRKR5RF/tQ8LETsrN0RzGv8vSu4ZIbCTLlbsE4jUB4ZXXaNtWbU+Lw7TczdQ9imFBb0WEDwhPOmWAH2EwC4aaqg6QjrBfB6vaEYynqpAyJaAto9ZYYT+nb64S3n1LUl2ENfFL3uxf/0TnjA0CdmEU0SjIJll1OLYhOUuYPI5xMMPLjoh8UOWfp3EBB+X2tUfhQo+F03HvPu1azRKf8wLv2ylgvUJ2lFMRwPmPVimet1FZe7dDYQ== 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=NXl+jkY6ong5Phsy59TTE3OHZvwQGTrSsZW9TS0xUyw=; b=KtpjN4fykmTO5KW8M2qK/jfn9GoV82M0SloottZCTbzpN+2nlufOMtmKzS7qXzOGKrBwPd21pkvq2IXE5VBk+TIu1p83ai6Jt2eBUOaOmbITJXgoDlqgIifLjb9Z6/KO8l7/pCzfSeQO0w+Y5eVsnH22AkGH0tGpJd+UFMYc/4BFLVvITm2N0xLl77lXi4xBqwmpyqK4fGuIDFlcqZPxG64ja8OgVAOtSHoZ+Jp8DxpwkDEs3DvrOySgqqmqfgGzUXQH/VQxiwTbrb0QkveuqdQr6E6IUmBlvrW6mJ6suviMlYQuJYU7bCnrcsbf9EdlTZ/Fp+60pTWw57z16CaliA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.6.101) smtp.rcpttodomain=nokia-bell-labs.com smtp.mailfrom=nokia-bell-labs.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nokia-bell-labs.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia-bell-labs.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NXl+jkY6ong5Phsy59TTE3OHZvwQGTrSsZW9TS0xUyw=; b=D+L0NBTLL7yJL43ew4bgg6gov/n0rBrtygWzwnnXlXzZsdvP4ZvNNj3S0yjByUfy2roxWgQLcDq6WJnY/5HQ8+VhrkuvXbUQOQ7R118G4SFY21de4TtMbejS88AamxsOh0PEcuTIYuPlYabfqqliT6F0JO4Kgw26V595Nn1D1x6JxrPqtaevMiMCocJ8qZqUP2uNBGgdOf/FSc05OYJWYAyf/gFr/tYN8YuB2AQXDMXgCclBVhfNS9nGAXakOClAspmSBJi+OEzdgzs7OENFW8rt/Ai+k/UIyYYGsVvnP8Zsb39WzwvP48KmaDbLl65UIo6NDrVap/DBXSxXiVm1hA== Received: from AM5PR0101CA0018.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::31) by GVXPR07MB9680.eurprd07.prod.outlook.com (2603:10a6:150:110::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17; Tue, 15 Oct 2024 10:30:20 +0000 Received: from AMS0EPF0000019E.eurprd05.prod.outlook.com (2603:10a6:206:16:cafe::97) by AM5PR0101CA0018.outlook.office365.com (2603:10a6:206:16::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17 via Frontend Transport; Tue, 15 Oct 2024 10:30:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.6.101) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nokia-bell-labs.com; Received-SPF: Pass (protection.outlook.com: domain of nokia-bell-labs.com designates 131.228.6.101 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.6.101; helo=fr712usmtp1.zeu.alcatel-lucent.com; pr=C Received: from fr712usmtp1.zeu.alcatel-lucent.com (131.228.6.101) by AMS0EPF0000019E.mail.protection.outlook.com (10.167.16.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Tue, 15 Oct 2024 10:30:20 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fr712usmtp1.zeu.alcatel-lucent.com (GMO) with ESMTP id 49FATtnH029578; Tue, 15 Oct 2024 10:30:19 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, ij@kernel.org, ncardwell@google.com, koen.de_schepper@nokia-bell-labs.com, g.white@CableLabs.com, ingemar.s.johansson@ericsson.com, mirja.kuehlewind@ericsson.com, cheshire@apple.com, rs.ietf@gmx.at, Jason_Livingood@comcast.com, vidhi_goel@apple.com Cc: Chia-Yu Chang Subject: [PATCH net-next 13/44] tcp: Pass flags to __tcp_send_ack Date: Tue, 15 Oct 2024 12:29:09 +0200 Message-Id: <20241015102940.26157-14-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015102940.26157-1-chia-yu.chang@nokia-bell-labs.com> References: <20241015102940.26157-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF0000019E:EE_|GVXPR07MB9680:EE_ X-MS-Office365-Filtering-Correlation-Id: 839b605a-2b3f-4419-97fa-08dced045e9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|1800799024|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?xZG9xNimkADOpagRMcrEAHCiQUXmIMZ?= =?utf-8?q?caQmDbJNC4/i3Rd7EV0un3MIt51SO/427hQPITYutbWq7mIQAwFIRMt1Vykstu1wh?= =?utf-8?q?mZHFqZ6gzFQVTnOaaAHBe4f3Mq1HVw3WBMkt+QKBzlKmtgf6lRDYJEjxODfMGVlYS?= =?utf-8?q?vfDreQD3dUZfz9VTwd4AQ18PR9sGLHCm2deAev1QrOfhvcVK+Nytzwa4/v5qAVOn8?= =?utf-8?q?C90oDAIvXb4r/CndTYRFTLegcEguyE20xMJZ1tjo5QfzZA+mpOcvWcYKolQlN+uhs?= =?utf-8?q?5feVCpQgxL56EWmbVZmfiyVaKJt2rCqvRnqMdXDuNYZcRnsbtfTMn3pvislEteTft?= =?utf-8?q?mXIUn0vn3w2dNYYBkgK+qeO4GBl2lpfOWaO3V+FkA4rf9uwhP3l7EQe0iTEOha+KQ?= =?utf-8?q?v5opvbocnNhnqjFEMpIGx273uhRKw+rRt6GmlNrCw10H//NGjift/HedpWQylxobd?= =?utf-8?q?EW7IBTFstlraTj8OcxFucwyGnGRRhLu6dqib0kDvGwGJwTvQowX3iYsfh4SC0WNf5?= =?utf-8?q?mxY+7D8lleabeCWCK16SFK2VClxgulPWIQbROYDo+0I/2z3ecL1p4Qypo9iLoHTDP?= =?utf-8?q?v1c+KDTZ/XKE1xSl3HOD75E/bKiCrJRupIuJBClDl196gMfQX9TmTVBLOVo0ta+4x?= =?utf-8?q?ITmIBUS1V80Dw7ITzlYhM6U3ufeNg4et62yh7Kj5TIY3YMvM/eCQu9m6vDLoaC6bH?= =?utf-8?q?wUpt7MigqOJx/fpO0guLh/eXxRbeHqU5qm1tr9U1lQfVRBZbtgOiJg6/C8hvm8Rsg?= =?utf-8?q?YYmYm48tNByCyTcytDgI25XCcTw+66r2k4N0ckRGBcEPz40R4/S0pLTN4UhGlosGp?= =?utf-8?q?PczRLOyr16sggbtWelgQSb5ZxKKiO0yjkLpYlrw3InjO5lTrBW4AAmwNBgteRGqpD?= =?utf-8?q?jeDeMmr7jNxqxlO/T84MA8MKAZnaGEPUStUBMkJY4gAr3BQ2heb6vOZAdU2UU862J?= =?utf-8?q?f4L0kj7Efls2bPlDGz7KLEk9UvSOKb9omBm5QKu15HsOQgjbJowAso+5NhrKVShAd?= =?utf-8?q?d6k3Ad1IumsB6zQxOrphdgrSvtemsj0pxLOw7tdjxyj/LB+cYNEq3Bhzapu+Iy51Y?= =?utf-8?q?2qQI9luP41ZTWeRW/LaxMQDZgcGHsjkkc5SIJgQ7LzgNLyobhd6sQmLCoRBD4mG3s?= =?utf-8?q?jnU5tDUo9ocxVHQwxdsV7z2iTj34oz7PMki2mxzEmWHsXlnt48B+wbUXfNYrwqDmf?= =?utf-8?q?gdfERjuvkOPk0pmcASzTX0YmutYF3mV8Fm5BYx/f72l4ObVWEl/yZ+lfLRBmVCY2J?= =?utf-8?q?E14Q4LJOIkepkZQDhIPf5F5OlTFJAkjqzDdV6EC32dOgHcoYa4euo2d0AOvGioWTY?= =?utf-8?q?nfw8cXW+C590?= X-Forefront-Antispam-Report: CIP:131.228.6.101;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fr712usmtp1.zeu.alcatel-lucent.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(36860700013)(1800799024)(376014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 10:30:20.1712 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 839b605a-2b3f-4419-97fa-08dced045e9d X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.6.101];Helo=[fr712usmtp1.zeu.alcatel-lucent.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF0000019E.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR07MB9680 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen Accurate ECN needs to send custom flags to handle IP-ECN field reflection during handshake. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- include/net/tcp.h | 2 +- net/ipv4/bpf_tcp_ca.c | 2 +- net/ipv4/tcp_dctcp.h | 2 +- net/ipv4/tcp_output.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index fe8ecaa4f71c..4d4fce389b20 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -704,7 +704,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority, enum sk_rst_reason reason); int tcp_send_synack(struct sock *); void tcp_push_one(struct sock *, unsigned int mss_now); -void __tcp_send_ack(struct sock *sk, u32 rcv_nxt); +void __tcp_send_ack(struct sock *sk, u32 rcv_nxt, u16 flags); void tcp_send_ack(struct sock *sk); void tcp_send_delayed_ack(struct sock *sk); void tcp_send_loss_probe(struct sock *sk); diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c index 554804774628..e01492234b0b 100644 --- a/net/ipv4/bpf_tcp_ca.c +++ b/net/ipv4/bpf_tcp_ca.c @@ -121,7 +121,7 @@ static int bpf_tcp_ca_btf_struct_access(struct bpf_verifier_log *log, BPF_CALL_2(bpf_tcp_send_ack, struct tcp_sock *, tp, u32, rcv_nxt) { /* bpf_tcp_ca prog cannot have NULL tp */ - __tcp_send_ack((struct sock *)tp, rcv_nxt); + __tcp_send_ack((struct sock *)tp, rcv_nxt, 0); return 0; } diff --git a/net/ipv4/tcp_dctcp.h b/net/ipv4/tcp_dctcp.h index d69a77cbd0c7..4b0259111d81 100644 --- a/net/ipv4/tcp_dctcp.h +++ b/net/ipv4/tcp_dctcp.h @@ -28,7 +28,7 @@ static inline void dctcp_ece_ack_update(struct sock *sk, enum tcp_ca_event evt, */ if (inet_csk(sk)->icsk_ack.pending & ICSK_ACK_TIMER) { dctcp_ece_ack_cwr(sk, *ce_state); - __tcp_send_ack(sk, *prior_rcv_nxt); + __tcp_send_ack(sk, *prior_rcv_nxt, 0); } inet_csk(sk)->icsk_ack.pending |= ICSK_ACK_NOW; } diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bb83ad43a4e2..556c2da2bc77 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -4232,7 +4232,7 @@ void tcp_send_delayed_ack(struct sock *sk) } /* This routine sends an ack and also updates the window. */ -void __tcp_send_ack(struct sock *sk, u32 rcv_nxt) +void __tcp_send_ack(struct sock *sk, u32 rcv_nxt, u16 flags) { struct sk_buff *buff; @@ -4261,7 +4261,7 @@ void __tcp_send_ack(struct sock *sk, u32 rcv_nxt) /* Reserve space for headers and prepare control bits. */ skb_reserve(buff, MAX_TCP_HEADER); - tcp_init_nondata_skb(buff, tcp_acceptable_seq(sk), TCPHDR_ACK); + tcp_init_nondata_skb(buff, tcp_acceptable_seq(sk), TCPHDR_ACK | flags); /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. @@ -4276,7 +4276,7 @@ EXPORT_SYMBOL_GPL(__tcp_send_ack); void tcp_send_ack(struct sock *sk) { - __tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt); + __tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt, 0); } /* This routine sends a packet with an out of date sequence