From patchwork Mon Apr 14 13:13:08 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: 14050359 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011033.outbound.protection.outlook.com [40.107.130.33]) (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 102842C374D; Mon, 14 Apr 2025 13:14:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.33 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636457; cv=fail; b=rcy1v7+GYzW5qfZ2LklQIyELFu+2MuszQNjsW7GiFCpscQUNowkjIy9U46WUhp4fUTvFuCVn2BucbsiGL1uQf7+32og+wYF8RwC5og240UEDsbm9MjHtOT3ZyL7S8U6o4QLh0Cz/njevxwcqBrUaadENtdViVp8O1klTRrHw60g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744636457; c=relaxed/simple; bh=+ezEZy8hckPaea1lF4ilsBt0GsZjvoaMn1f9l0j0RCk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hx14eiX2lkxHo0gHY2trmYnziHoW5Bma+1HP0sj65Q5J6Blm1HsG7H8QmrBarK72SY7UzR4XPOOQqp56FnhfqEO7FmNFolz8B7AYDhS1il2ar0Sv8P3sfcylGwiCBn5q+eAUf8BAO1IXdc+2wEVpXgJk2YlPy6aKivySIe2+OZY= 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=Azkwzj4F; arc=fail smtp.client-ip=40.107.130.33 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="Azkwzj4F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qriuHmEf1wvtnWkCJLMk5pA6/2D0lFxMYw2sHoeF5yZN3wgcHjqpPX5fP4jpjYniR4hNK7b9OCNBznH5xCcFPMV87xYDGTC2C50E2/j1V5LWErUxeXz5Je6xxpKtVJnATHHX3+ik6bVWnqPAT18jmAC5qs0oP5Eyx9kg8gAZ3wxTDeeCa6/o3f9UDy8rFTibtPMbt1whoXU9hy4GXJwtEzzIiOydZrub6LZ93/YPtOFax0QJepdf9Rp6fn9sPTamiFE9VLyVHSlOIvuDQPAND/gE1+CmHFYRQ68T73k3XSddRj9sKfSpfHfwZppP4CuIZeTx4OT3W1pIlcybbl3FXQ== 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=ix+QtM7JJKtuEJJnzOOAErViBOEsmOlScq7uOdppACk=; b=wzCOkKgC0wxAVH/FRPhTv1c17r82uzis669Ya0mrH7Tl8nqvFlENvvS13Yox4kAfWbeVASCpKNQd2rzf/f9kdxl1znKThZPkPirNVolFtY/WOdJ0aMxX2m4xNd/lfPY9ZvTtTzBWT/EFLIqLM+ylIh+/MTXIyvFzg7NBhPB19nXCNEHCdKDBbQrRwcm23Jm9E+OJmh5B3BhVyobOOdrzJdEEsdSrwVVDVCAH2WMdnKfK57UtW7xYpb/JisJ3F5TRLY+FpsCz6lExR/YTZL616ZT8hCQc4n9AJSkC33x6qIMwg6TRde+EDt3E9G10MAI+31Kg/ipe/jqlbdxZ6raX5g== 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=ix+QtM7JJKtuEJJnzOOAErViBOEsmOlScq7uOdppACk=; b=Azkwzj4FtfmDyFLL1vQcH92Ffv9kS1+n31k8SZc5Brhnwm2HrhRF/vVXDYu8d4iZ+8BFPPRCIEtj20T9WcKnWOXou2KVW3iZNmD7lEZFNPvACB3Q3eaQIk5oKel5PhuPeQx1CCcvt02foDEDoyjmb6lkq1I7FQKZ8FNy5qS3hpv1LH9wQoOEPe0lPB6Eqgg5CaIwytkPKXWXDAred/jJwhlfbIwGxzmN1hIGLL8TYz21Uad8kCEiHvdo99llh5GyOK2D+VJsyMEirlEzkD9+B5rGK+OvOy3ZZTUlyMZU+Z/pFwg/mE05tr46NzOqwn3w7WBLHqI2OD2+hzVWrV5ixA== Received: from AS9PR06CA0210.eurprd06.prod.outlook.com (2603:10a6:20b:45d::28) by AS4PR07MB8458.eurprd07.prod.outlook.com (2603:10a6:20b:4e5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Mon, 14 Apr 2025 13:14:09 +0000 Received: from AM3PEPF0000A794.eurprd04.prod.outlook.com (2603:10a6:20b:45d:cafe::ce) by AS9PR06CA0210.outlook.office365.com (2603:10a6:20b:45d::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.34 via Frontend Transport; Mon, 14 Apr 2025 13:14:09 +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 AM3PEPF0000A794.mail.protection.outlook.com (10.167.16.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Mon, 14 Apr 2025 13:14:09 +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 53EDDQBJ009623; Mon, 14 Apr 2025 13:14:07 GMT From: chia-yu.chang@nokia-bell-labs.com To: netdev@vger.kernel.org, dave.taht@gmail.com, pabeni@redhat.com, jhs@mojatatu.com, kuba@kernel.org, stephen@networkplumber.org, xiyou.wangcong@gmail.com, jiri@resnulli.us, davem@davemloft.net, edumazet@google.com, horms@kernel.org, andrew+netdev@lunn.ch, donald.hunter@gmail.com, ast@fiberby.net, liuhangbin@gmail.com, shuah@kernel.org, linux-kselftest@vger.kernel.org, ij@kernel.org, ncardwell@google.com, koen.de_schepper@nokia-bell-labs.com, g.white@cablelabs.com, ingemar.s.johansson@ericsson.com, mirja.kuehlewind@ericsson.com, cheshire@apple.com, rs.ietf@gmx.at, Jason_Livingood@comcast.com, vidhi_goel@apple.com Cc: Chia-Yu Chang Subject: [PATCH v3 net-next 08/15] tcp: sack option handling improvements Date: Mon, 14 Apr 2025 15:13:08 +0200 Message-Id: <20250414131315.97456-9-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250414131315.97456-1-chia-yu.chang@nokia-bell-labs.com> References: <20250414131315.97456-1-chia-yu.chang@nokia-bell-labs.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM3PEPF0000A794:EE_|AS4PR07MB8458:EE_ X-MS-Office365-Filtering-Correlation-Id: 33bf6c0f-fc82-4d3b-d712-08dd7b563df6 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|82310400026|36860700013|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?kri6LKKkYgcEnsVo7gKm51mcrUassaA?= =?utf-8?q?wo+UH2uh7veypcVcgKvuKfL1naT9OE0s3NZjFk+kj8Js6i/iE9BEDWbNkk6Nq7Kkc?= =?utf-8?q?erX+XWrmOWuA65ucAjRS0y15uiwQzN9wrjXjQuqQpK/9gHu22GZfDwIlyxiJEZjkP?= =?utf-8?q?Ol5wnrqi6oLFm4OiyxHWJMwixiPTIR9qpIr3ep/S2Dwa2MOR4e7+HkwK8VpL5LRcX?= =?utf-8?q?WdppNFoyoItpk6c75RSTSeoUXOKbSOyKEOyTWvRwPRFxvG6VNI4dQZJCfXY0YHK1J?= =?utf-8?q?vmm3HfSWJ6Q6sFTMg15X3fiuXSJFdzX8HkJhogZBLLI/WshMLE8OhXyUguNIYCx8j?= =?utf-8?q?8XEvUCZ3+FZ+mk/GbgtuPQXAjal//Mc/1xnFZ1eJF9KD7XOqJlEElDauCbP4uvsU6?= =?utf-8?q?y5whoVnc5jMFwzGB/iAx2y5LDH08IR8MlKpMKpVYu/iamAFRdIGLi4VlGvC+J44c4?= =?utf-8?q?K7n2B2EeM1pjEHY2jWrwJJ1APkNT9EcJ1PiYvFO/kvLUfC9v8uFjG9oMffz5FWkl9?= =?utf-8?q?PfAWR+Gr16BDSPF81C7kVoxy/w97nsZhnNESCMXUnIvQOrhGxaEsffV+iSddsi5eq?= =?utf-8?q?uGO4JymHTbRy18hwAXlHkm4ZBeD/a19jJdDyOyxf8xGnF9ZWJD6PjquT2ahK2xUH1?= =?utf-8?q?h3nr2md6VN7xi2ROL1Eik3er8Pd/MJJROX9cCvlU1a4wm5aT9EIlluq1uqxEwDaWf?= =?utf-8?q?FGXixGEenZp2iI/AWk2YuH/CuAb984qUV7TMRMRVxWpeuWDGoxELqae0HcmGJDd7G?= =?utf-8?q?Ebs2HHTTXCDUM6INlsvish2vWsvNVYCoG2j3C4bi9f7eJhUW5ThX5mV11vo0qVwge?= =?utf-8?q?fPk8rVPk9/9HaSulctyAiAFXmHs7wga74lxuxdbfN7RZ5GP9j5CxjjxA/nxJz4aRD?= =?utf-8?q?NYl4nyXChrzGuAVQAr0248cFpSuaCJoyUsBGGRyRJBIiHez3U1m0+I1aihL4T+Gx0?= =?utf-8?q?CuoGB2D6aLy2w3fAlYm8la48+jIMxUSRFHfcbCWx3bp8/GImgNL17QPa2eY3RLF1I?= =?utf-8?q?74EuVcujjxo0P1RO6U9BHFfG8hSqkGbBDYH26Sj4tFhMagdcG/wVD8HnQojSqGJt+?= =?utf-8?q?zCsfA9y2zLK5PoFJngQx5Da+lNA8w6nfhU/F9rrcNzo7kZXgFCzs8GlWr0OJopYC+?= =?utf-8?q?pEhcDtPgmdqQq7sQAx1u56FZ9tbmL0Azt//j3/opGD43j7HTTYDEAGLWcDo9fuKGW?= =?utf-8?q?MxRpMAnc9BA99M30VICkwn2PzmyKQQJvD7r3jfkxnJPdDzFXWhXLLNiwRr3yDWrB6?= =?utf-8?q?0Jpq0Llkl1VWTI/AGcBgIz4nMWitx3tZrtuaS9Awb/KR9Uw3Aj9lfwD0zp0cQ/lPw?= =?utf-8?q?ZEw/hQDmCMt+A7T+fwURrt34WmuERuVgQ75rpDlGUE0RRrAQ/mvknaF0epKdlWFL9?= =?utf-8?q?pBUTlNZieDyP6kQgJDxzScymwsUIv1xdOBZKrUP1TQ+kokj07kaswd6C0lP7aEQoq?= =?utf-8?q?Bnz/1bAD7G5izaNCzMF4hzcUXHfzF3JQ=3D=3D?= 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)(1800799024)(82310400026)(36860700013)(7416014)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 13:14:09.2531 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33bf6c0f-fc82-4d3b-d712-08dd7b563df6 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: AM3PEPF0000A794.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR07MB8458 From: Ilpo Järvinen 1) Don't early return when sack doesn't fit. AccECN code will be placed after this fragment so no early returns please. 2) Make sure opts->num_sack_blocks is not left undefined. E.g., tcp_current_mss() does not memset its opts struct to zero. AccECN code checks if SACK option is present and may even alter it to make room for AccECN option when many SACK blocks are present. Thus, num_sack_blocks needs to be always valid. Signed-off-by: Ilpo Järvinen Signed-off-by: Chia-Yu Chang --- net/ipv4/tcp_output.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index d63f505a30e2..ad97bb9951fd 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1103,17 +1103,18 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb eff_sacks = tp->rx_opt.num_sacks + tp->rx_opt.dsack; if (unlikely(eff_sacks)) { const unsigned int remaining = MAX_TCP_OPTION_SPACE - size; - if (unlikely(remaining < TCPOLEN_SACK_BASE_ALIGNED + - TCPOLEN_SACK_PERBLOCK)) - return size; - - opts->num_sack_blocks = - min_t(unsigned int, eff_sacks, - (remaining - TCPOLEN_SACK_BASE_ALIGNED) / - TCPOLEN_SACK_PERBLOCK); - - size += TCPOLEN_SACK_BASE_ALIGNED + - opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK; + if (likely(remaining >= TCPOLEN_SACK_BASE_ALIGNED + + TCPOLEN_SACK_PERBLOCK)) { + opts->num_sack_blocks = + min_t(unsigned int, eff_sacks, + (remaining - TCPOLEN_SACK_BASE_ALIGNED) / + TCPOLEN_SACK_PERBLOCK); + + size += TCPOLEN_SACK_BASE_ALIGNED + + opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK; + } + } else { + opts->num_sack_blocks = 0; } if (unlikely(BPF_SOCK_OPS_TEST_FLAG(tp,