From patchwork Fri May 9 21:18:13 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: 888902 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2067.outbound.protection.outlook.com [40.107.21.67]) (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 118412609DA; Fri, 9 May 2025 21:18:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746825537; cv=fail; b=fF/UqUETcO8rGLJTptgkqr1/RYUv7xBzCqmTZI2TDPemFxQmJCtklMFZrou7DG+2HGUApvxbMYLw2Kib7kBIoqlTdl/oXyrnhlzeCHQzXvCSdFGphXwCxXD0JVyv4hd1LY3NVjYt8Q/X9mNcl01OVm4SuwCpVDWlbGtVARphBTw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746825537; c=relaxed/simple; bh=efBfSKDuHxcloj+DBa8sSHbHHP7NCEJS5VS00AD0ac8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Y3Y2huCIOmgPvfohTx146EQmCq/hybPxMHh6M0ha4gWym5R8yMfdGAxXKfggShwIyXDXI6LtHDpCK0lQZuUJCTPNshRz2PMQMuOGnnvPCFRq+3/joS/+sRPCcZjwjgY4CJjSWR0fsTY/XyKEefnvZicqRy8pOqn4WT4ZuWAL23s= 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=V0psJQ4m; arc=fail smtp.client-ip=40.107.21.67 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="V0psJQ4m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nxNJU5BEdxeLg6UG1RhcwCFgbiYTgUxjYqzGVzHPG4OuaRRMYEFvQBS07sG0TYt3aoJsgt2i57BHiwOHAlg2538QP9gKwi4GbOUbfpTCVDn478KR52kdkiyZz0XdrmCuCZpwC/I/CxK1iuJjele/SzHay57Y7AoR5bbFF9f3hWp/VYFsNLYq+J/nFUkMExvP002ZDja4xVviqf44xGiO+LKvm5Fr48WYKN4mADizataWzGpMLogrOUF5QZn4hUHFHnLHw626verVYJobehz9IPiAfHRLAfD/WrEujJe9X7NDptqGlZJ9WlA0lGNA5gNggRAxkWfr1VH9VZqeG7MDjA== 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=0wdBaOw+R+gO3hHVWq7YjLCMZy0Pa4hT3OSUOV5WkhA=; b=J4npn44/gknPCRR+4bcIbyUSYGebSil3MoAA4l0FsJwO2wk47pJ782aHMubdYNqjpBaDcyyOqTNa3HhLpmjXn22gqUtq4GHZPTuMhkiru80RlGTl9xUELvfmNOxNJMPTipJZzk1SqzwQsDOvsYq0htYQn6ATfAxArhOD3mVGPYarB89UBWSADovwDtbVCVUbNdIWbNwWxWSlMofVNW5QrutaBu+On70dHuPLmBdAiQPZtWw/KIPa1Ph7KOpYoIIDVImhx/7ZY+nYBzOes2hJX/LbZYoNpbCSV0EoXn/YjVUhbDJF3+io5VMnxAa73lJ5VKMMcjMnNvxMzUPLA5tRKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.240) 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=0wdBaOw+R+gO3hHVWq7YjLCMZy0Pa4hT3OSUOV5WkhA=; b=V0psJQ4mFfIF6yG1ncSj37bafdO+KJ3Q0qnLmlBYhs/0gWI3k0OrfmpzJ3ULiY66r2HdzBsSifIKE8v1hHqO7TK3wpvw9uYvlC9GqNEl7mhVU8O/qmudma0DIzm/4QIjIX5Fi0sF8QA3Fw+WIxhuWfxVkVefCD+w8NZt0kzM/qaZmAQCs7JhS1y5E03bWneqCCHxrt80HJEaaEHK6pkC0H0zCFuY1ODaB154s5zaL3BI0Un3Nvds86UdaXWaKo4JZaeMJ/6pO80PU8n3su/FKciGmEzk8zQES8tWPjKboa3g+hO1po6JGTmcDpM6rd/BelqbPXuDAC4hs3zVB0S3Tg== Received: from AM4PR05CA0015.eurprd05.prod.outlook.com (2603:10a6:205::28) by AM7PR07MB6642.eurprd07.prod.outlook.com (2603:10a6:20b:1a7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.25; Fri, 9 May 2025 21:18:51 +0000 Received: from AM3PEPF0000A78F.eurprd04.prod.outlook.com (2603:10a6:205:0:cafe::cd) by AM4PR05CA0015.outlook.office365.com (2603:10a6:205::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.23 via Frontend Transport; Fri, 9 May 2025 21:18:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.240) 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.240 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.240; helo=fihe3nok0735.emea.nsn-net.net; pr=C Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.240) by AM3PEPF0000A78F.mail.protection.outlook.com (10.167.16.118) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 21:18:51 +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 D78C12009B; Sat, 10 May 2025 00:18:49 +0300 (EEST) From: chia-yu.chang@nokia-bell-labs.com To: horms@kernel.org, dsahern@kernel.org, kuniyu@amazon.com, bpf@vger.kernel.org, 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, 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 v6 net-next 08/15] tcp: sack option handling improvements Date: Fri, 9 May 2025 23:18:13 +0200 Message-Id: <20250509211820.36880-9-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509211820.36880-1-chia-yu.chang@nokia-bell-labs.com> References: <20250509211820.36880-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: AM3PEPF0000A78F:EE_|AM7PR07MB6642:EE_ X-MS-Office365-Filtering-Correlation-Id: 941e08bc-e87b-4762-e441-08dd8f3f18a7 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|36860700013|1800799024|7416014|376014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?no6ekWLEvX8NBDZ2MHGwT5RNcB083Gq?= =?utf-8?q?Pcbn2SpOcZ1H6CwLOidlrnub4UPlSOvC9kDkrglp8Q9u7u9fj9qK0y+oa6QuWoqOL?= =?utf-8?q?tE35psf27BmttWH8N0vXJLxELqbHXKechF71rerCWPpXuMI36ZWWynVp9+BKeNC2Q?= =?utf-8?q?M37A+RSXkbz8M1R4X/phciaxGW626WyG7lb0UQffhrUqE6VHGX887G8VM77Wx+/Kn?= =?utf-8?q?PafZqiuXTyPkcp+R1WMGJhNu4bRh2KG2SbTgEHnz7WXYMKg6XLcKENB22MG/QD2vG?= =?utf-8?q?2kpafg1XVb9SzmCC/rlz/6c+lux//hMi1P1BNOp/ZysVfX97HqWWQl1ooJ43o9EbD?= =?utf-8?q?nmCpYwT+z/LdBV7khORvK4ROB4gVZ9CuwhKWS9IRVxM94xrT0YujggAKeOVWg6YFQ?= =?utf-8?q?HW/RZUiXOPutO5EnGH1n3QYjoDkuYaHugM5nKXdCYe0tLv/Ml1eMdjKfTXIlDN8pD?= =?utf-8?q?9EICT7f8BSGBLOKPNkQbpINipGUpJo+7y0jJfe0ID1vYLFzxeWdTPBJ4g9S4/oGlo?= =?utf-8?q?USUBksR6M2fwFoIx1AppbJJkTNas7bk2SGuaFJDtZAkKb+ewy8sYDUPSBh8ZNNqgK?= =?utf-8?q?dqchIBnJYBN74TW8KPFIAz/C0l7YWrIjrNqzAoNVsZaRLlXpuqNtO0w+zXawCTQ3M?= =?utf-8?q?FHzOAdxVZRTt57TgNGxvzEjY9qkVtcGAtzlzvIWL0bchki82sVHvHIHO4PmR/f/89?= =?utf-8?q?eVJ+MMpITZJN4gmy0o131+yXFYQzqWgbqpIToP337PmKwh6aaWqhBnE2VGtSVsCWT?= =?utf-8?q?JvFusd/ZCi8WR90Apsmdj3PgHAz9Rt62FTWBkxi8kvh5W9XjxYDQ3hywhIKloa0/4?= =?utf-8?q?ezxJUCBchHpYZSSEO/OBHI04rkOYJ9wf/z0SuInNcl98ZW56Ol06miiVsLOMKcmrK?= =?utf-8?q?XxBZHHTzBpKfsxX2Xc7tMVNz9qklcgOW/IoMa+8jVWNgFpAADYZDPLjXr1HTP3qjm?= =?utf-8?q?AXFvGHr4iJBYAvj6y041imIzvZ88+UhT5DhPDcGY32BnDuK0slUtVvC9HhSLk0r03?= =?utf-8?q?/jajkIZDtC+mLuyXCK0NgI6pzxXdFTRAYLhgrKB3KpLE0z+fPYs9lZuHCaJeyI5E1?= =?utf-8?q?y6GmLWKBEi0jBDvg4br5HjAlqzT0XWJl72PXFo4MIAJKbAJvJEBVSZSY2xdjyPrEc?= =?utf-8?q?cUEBjpjNR1ALJDcguPfYAnKwQNunDh6W7VYcO2v1cp05B+wfTf4qIM1x3cckRunxI?= =?utf-8?q?hNXUKOWEI4J3RnYShA3ZRIbUZjGokdt1NWkDCRk9nRIg7J1gQUcI6j18ugkiLkM1X?= =?utf-8?q?asp7Tb0g7+nzmaCi+6/a7VvC/SmnYeedt4MoDOPuw6Snwkz34ZyKlPTbOjZUgSNex?= =?utf-8?q?+bjXdSjNHzFxrV5psCAptMnJTlFgMdRMMPhxXwpbPWibN/Bj0f5J/Dtc6CcjRWg8+?= =?utf-8?q?FDKggq13LCpA55zPowoT36o+5XotVzDHyyvUeB/JHxiTFC79yi4GoRuz9/M7uyg1H?= =?utf-8?q?G4drXg768/5YAmv1VEF0xWwuSsLidshg=3D=3D?= X-Forefront-Antispam-Report: CIP:131.228.2.240; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0735.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(7416014)(376014)(921020); DIR:OUT; SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 21:18:51.2558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 941e08bc-e87b-4762-e441-08dd8f3f18a7 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.240]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM3PEPF0000A78F.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR07MB6642 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 b4eac0725682..f2ce46476c41 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1091,17 +1091,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,