From patchwork Tue Mar 4 16:30:39 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: 14001118 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2088.outbound.protection.outlook.com [40.107.103.88]) (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 E35DB2BF3C4; Tue, 4 Mar 2025 16:30:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741105852; cv=fail; b=o+FbSRMMd7G2OslZitvb+FrkCI47jq5MRj6VzF85HQXhdVAvtr5bbLxxKTKhMYJZKYWy+xo7sQ1YhLc3ta4gfX/A8EiXDyA0uw+OR6qrWBsDv+OctKuvxTsKwv2l6WbnLt47/vXqyEsLN02QRJ5wt7LRy3TuwGw0c+Mjl78z58Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741105852; c=relaxed/simple; bh=kEMTwggpvfj6X3uqQrKG1E1SLaMV3zClTNLGP11BQNs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=uKE24/BM5ED9YuLirFBE2rP/HG4SQ2W5sSjzsosvoE7fMyVQfhXDXtI1/6RhihC+3EJQ50g7v1qhW57Uf2stYNW14u5PRHNGeTdwZ+wdoKqd7El+kWCy+d9wQ1ISwgPNKySaJDl+8Au8xA+Rcbs1pIGYfAye2bovMMJIhZZrhZo= 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=iBnG1Fvx; arc=fail smtp.client-ip=40.107.103.88 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="iBnG1Fvx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W01YruzWoqWoPRIyCUo4uxoBiI1JIqIVKfIxl8kItQ+y7+ClLloc+a21RdqjJWGqfaMYPsTvFHm2A7dJTEmfVwjMLVNLTYrnEq72/krRbFYz1a3u40MKizgr0g2M0dVlaLYnV4/AWcMJlcH0x50rq2YPtz4q3aZOsL95I6UCtWvo4iBl6BOTvHL07yH03zABgQZOM6e/9n65A+1GsURTvVm2rqNN3FHVoeytK+nq9p9iZ64T1PnqkE/iVTmUCP6uTNWr7HFCObGdi/AHcjIa8ZTx6KlGevJ7GCCnUMqWClnF6+BQ/oiqSjNycjcdexiXQt3Eg37wXQAOM0zxmMc4nQ== 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=UMB3e50qSo7+nFbyvwRwn06pAAVzB+09EnIvXQDF5uk=; b=RXIH9+YdXEaWsRfMMP0EShFo5RFRcR0rAofjn7NcHuSHX+JRhjVPkEVIhUr/KkOuDfQR8Ptc3J9aOVytwbuuP+ltP8HgCQtNaQKmFJYJMNXv646LaTUkBStimbeufnlncTLKb0kcTuKNVqmEx4PMbEX9j+YrxbRDUajBRXfJG3KlBXXQaT4ljQGqIY7u+hDhIOq3r/dZs6hTXIgrSTLcjRFL6ku3V43cAWmG8VrcTVbVYivHEB516/iWzVCoa7Liw/2mOqJblSPKZqjgs7R50cE7kDwcD2DYu3asmr+FXkKxpxa6TxTWScyhWof8Hs4SJ8TDT4WSFoTom91Llx+Apg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.20) 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=UMB3e50qSo7+nFbyvwRwn06pAAVzB+09EnIvXQDF5uk=; b=iBnG1Fvx3SufRcnT8e8YxQ1VXFmex5U+jKLPok82QpSs8Ct1UiECp9PIiQD66bmep2tdnuGw+/PpvtWTqxGHVAT7LHpTiqXvxffyV07a8wIZxaVjyMAxH1CDUAR4ob+zI0i9oGswmy7+a3vSkLQXu01bumJXRUuXuKd6Kok9On9u4ReM2WVDz940ubsku/WmgiE8tl5d7OX3wzn3I5re7uEzWeEl+mru4XIB8n7TEW3PpkTFgfqyoQecO+rN67WG441kzb9qU61e9yBL7L2GjwddpV6DPTUbWPToL+ahiSLmsx5jXYxuqhPPlI7UbnVMaGuW3ZUEePyvSfMrLX9pAA== Received: from AM0PR04CA0122.eurprd04.prod.outlook.com (2603:10a6:208:55::27) by AS2PR07MB9183.eurprd07.prod.outlook.com (2603:10a6:20b:5e9::8) 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 16:30:45 +0000 Received: from AM2PEPF0001C709.eurprd05.prod.outlook.com (2603:10a6:208:55:cafe::c7) by AM0PR04CA0122.outlook.office365.com (2603:10a6:208:55::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 16:30:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.20) 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.20 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.20; helo=fihe3nok0734.emea.nsn-net.net; pr=C Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.20) by AM2PEPF0001C709.mail.protection.outlook.com (10.167.16.197) 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 16:30:45 +0000 Received: from sarah.nbl.nsn-rdnet.net (sarah.nbl.nsn-rdnet.net [10.0.73.150]) by fihe3nok0734.emea.nsn-net.net (Postfix) with ESMTP id 97BA924A54; Tue, 4 Mar 2025 18:30:43 +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 12/12] tcp: Pass flags to __tcp_send_ack Date: Tue, 4 Mar 2025 17:30:39 +0100 Message-Id: <20250304163039.78758-3-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304163039.78758-1-chia-yu.chang@nokia-bell-labs.com> References: <20250304163039.78758-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: AM2PEPF0001C709:EE_|AS2PR07MB9183:EE_ X-MS-Office365-Filtering-Correlation-Id: da4a72b0-a10e-47d2-c0dd-08dd5b39ea03 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?k5cKDDmt79uTm2bfVi6tl5T1wvDALI2?= =?utf-8?q?Y+LVnQivtKAChFylh/TI54b/eOc8d93h1QQQKPxFAXTHx+tzeg8PzakW/OLgEI86s?= =?utf-8?q?ZVw0HYrPHTGdSJ+qyKey9IPYVRln8ceIesvm2CyMWf5uQT6cRfyI15zaZ0y2+h7FO?= =?utf-8?q?1EpoI3yu8/yyvTPswsx+1WVp7pFxmlVxS+fOBfSJe/gEz9dxFnpYtbsl2/djo4xZ2?= =?utf-8?q?ygUHg8+BLHHwHgLEa16Bs19pHBqrSVydmTKzdDorbUksnjtJ3MxAz+1NbXzg3fDiv?= =?utf-8?q?NH+dW3K6rP/+mGA421rqWe/2pZURcMmTnW/GzCsGvOxAnxdTsK1Jx9+uCBN1hPPS9?= =?utf-8?q?taXBqtETYuHgmX4OBzhkKBfk6Pl0LUF+x/SoNcPryBvShd3F6FLq1e9mjcxrcu79W?= =?utf-8?q?uYSEhty5goHag8WidhX+wXW4+Zpg0aEqL7RR5WMw1p/1audINRUDG9I0XYxgmmRa1?= =?utf-8?q?nhF2aGacFVWjTeEopd9Yl/IOsWFLmD0r+fAzxJRS4h7v2cJMijOrBrLi5Hzjf5ibx?= =?utf-8?q?u+tZaT3VTb4zbHcbXAWJLIvCrYg9dJFP2sylU8IlSC+SR21uVB1hx66p8CFnhuS/Z?= =?utf-8?q?sCBxISNqahwJwTP8Zf0HBwBBI0to2Xbmxjix0T4Dpi87XyJyXC+3kZyZvNiucttE/?= =?utf-8?q?cp/TKUv60cXRTcCGF0XhO+aQt+31fwmXJ2SPxQCAaKbpBQcVIwWKj4rCPRLreNpbm?= =?utf-8?q?fuhht1tHSgbBTo5PJtlwLTa8zANfQU6ROiDy58ADg/aKunlEB2K71/K1WyLU8jhtM?= =?utf-8?q?vrtjSQESNBouTjSlBBOFWTWgegcC5/BErMka6nv+EqdRSX9ei+vkCETwW1RwlRksB?= =?utf-8?q?mL6FnXASpWt5GxvJGiQF+RPX843LAeqQAKl1FdK3HmRAe8sRTftIyfJ1DODhIlpJ2?= =?utf-8?q?z0mPRXn9974KQkwmjzFtC7CGqaLYXPbEiJ9A8LpeOKUwUlY14aiTslmtWe7AWg4Bp?= =?utf-8?q?5B6GBDxpgIfKbTGyEKFR3m6cnowBQX/k5+sviMnzsjsJB3NjylIq3ZDFTsJzks55I?= =?utf-8?q?pr2ML2nMipnocY2LabHD/EKZJPMuatd9Gj+7OrES1r8xsr8ehrcbuUM92n9K3ZUkj?= =?utf-8?q?MjGHco8Z63yODYZ/SMGYBhWzQcP7sSv4DVnXh6LL95l118SKoKn9KALhJ+nwTcIuV?= =?utf-8?q?jzVknmNKUoKtRrvNeq0xQGCBhURCohla6j4v+XyMZVCRkuVXFIKPdKsialtCQ5acw?= =?utf-8?q?m7cW0C/lBvMWo272OZABmWb4GJGLIrZtLn0YoNR2ad+uo1M7rx+WVPkaFFs6v4Zw4?= =?utf-8?q?AtzO6DxWi5Pw87mCKgoR/+X6pyo4PBpjyTrcCzG0oPo2qnZApN/DNoQwLsU/gdmO7?= =?utf-8?q?GOUw0/FgVzk/+iGxpVPpZqsjTcIbexMFUv4T0uwLa8kXUQ6Aaoo8gTgZ05ohfX1cK?= =?utf-8?q?lMJHfaWu6r/1Ze73ju2HnaQXWjH97mJNfUv6tIdU8TelKd/1diVI4aL0M9ulqBzia?= =?utf-8?q?KstQL3zPa/?= X-Forefront-Antispam-Report: CIP:131.228.2.20;CTRY:FI;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:fihe3nok0734.emea.nsn-net.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014)(7416014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 16:30:45.2450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da4a72b0-a10e-47d2-c0dd-08dd5b39ea03 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0;Ip=[131.228.2.20];Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM2PEPF0001C709.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR07MB9183 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 Reviewed-by: Eric Dumazet --- 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 3b9b3cdbc0cc..297aeca9109e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -707,7 +707,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 0d275ee68a1a..124b2e95bb0a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -4241,7 +4241,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; @@ -4270,7 +4270,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. @@ -4285,7 +4285,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