From patchwork Thu Apr 17 23:00:22 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: 14056285 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2042.outbound.protection.outlook.com [40.107.22.42]) (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 0D8CE221F2F; Thu, 17 Apr 2025 23:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744930872; cv=fail; b=j/WbXIJkdtMA4ym2ox/ZLyDIGi8MDnDpuxgvPehMGYz9pYpQJiZs9nYtGQzyFpMF1mcvBfvibi/h6CDJI0/A31rGv9utM7Fd75Y8RyB9bYB+MIut0udWR91KP1ii/VDUmA/EuX8p6tLagD++8ZAbPko31OahrPj/2TYLXcs/7uk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744930872; c=relaxed/simple; bh=+ezEZy8hckPaea1lF4ilsBt0GsZjvoaMn1f9l0j0RCk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=IXbU4Lr9s/bfvLFlKvV5kuPaEV9FQSy5AeD7gkG1jUI3OiYq82Vi3lZ6+a55nhKRYL2cXgVGytU+whpII35x7M+dyNCpgg2Na3lXR3vSVOSkbK1UdbXcNr8iB8e9fL3NCpJgGw6w+UIxP0lCuV2exebL05mL4+G83tczCaE+rWY= 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=RGwwTe+A; arc=fail smtp.client-ip=40.107.22.42 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="RGwwTe+A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HoyTECsrdB1+cMztxq+mduo6tkQaLfsK1gfy7ZulxzlwA45Xt5uNkaPfg/g6TfOmeqD7L/PAAzyXhbkX5QQve+shoL7e4Aq1+RQXVRiPmp3EMR012qC2bw04VRMJxUEmG4Iie8lF1jjZh4XqLQjfDoRzoyQwuVCclraqNcM9QxJkrRo06pYpquKGre3BhdZiyz2whwvSd0I9vwcNZXYZG09b0nDy4z+Q2e5qYOZyAHZlDC/6urna5JD+uC4eCiT/7oV7tWPa+XZwVY+8yCtMWu4kx6J75iulrae+VXFm5VW0ZzgiuTH/VmQqqn5Db0/hXJAgg1UtHElr43ERcPmdSg== 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=E8XvbHD10Kynxt+0M0VFdgJzy6GEyeGWKg49by6OYR9FhWA2Z3Fz7uPP8htJUrSz8YmnmWIhKI552H5ltDWAQy069RgZc4c2rL96Mc2ZTdPOSeW3PPabM3YajEOvnNOAqLDbnlKIeOIH0bwiRjh6lupYwmrJShAadnMKWvHitN2ANaoFDwYvxBtlf1+wYFYtgKyf8cNDaOQO+qrK5QRdP++E/KZOzZKdsTJpaFegZ56X8/NCkLkP1bFYVqhBBiQTOgiqWYdYCve2tV4Mzfa42Ol1iTBICmF4U8rPyd4oFqDgErI99wNZ2NJ0NlGZtUk92Zdz7lajRHXaDEJv4rTgjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 131.228.2.29) smtp.rcpttodomain=amazon.com smtp.mailfrom=nokia-bell-labs.com; dmarc=temperror 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=RGwwTe+Ag5GPySeZguiIAOMa7oqZHH+tB8zMhjFa4VLOIuJ0xswiMj7VAEWfbAC1ySDOe+F/kpTtUPzK/G8QxToX9v9KGObX7AACrlWHYXg8jP2F3WTEdSC1ojW8K+V6dIWtx23+HGZzvBuZWzbhxQiSXTAozTwCNNjUnTMk8Kzt+7TuRiD1iSmWWOTBRBe7g9+mqjyzWHJsfFW9svAKVWOaoVa1Q6Eeex7Cngv1+nVANMtHTS+7wbQ8VUGTyfyY7uejCojsLc5bxNadb/hEi+bHoHBlZylnwB5AdpI/iD0I5IaLBqNR2ODK7ugAZOVFWO8zhc02iyvR5w9WKwTvWw== Received: from AM8P191CA0006.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::11) by DBAPR07MB6760.eurprd07.prod.outlook.com (2603:10a6:10:191::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.36; Thu, 17 Apr 2025 23:01:07 +0000 Received: from AMS0EPF00000191.eurprd05.prod.outlook.com (2603:10a6:20b:21a:cafe::9b) by AM8P191CA0006.outlook.office365.com (2603:10a6:20b:21a::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.23 via Frontend Transport; Thu, 17 Apr 2025 23:01:07 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 131.228.2.29) smtp.mailfrom=nokia-bell-labs.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=nokia-bell-labs.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nokia-bell-labs.com: DNS Timeout) Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.29) by AMS0EPF00000191.mail.protection.outlook.com (10.167.16.216) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Thu, 17 Apr 2025 23:01:06 +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 6877E20868; Fri, 18 Apr 2025 02:01:05 +0300 (EEST) From: chia-yu.chang@nokia-bell-labs.com To: 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, 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 v4 net-next 08/15] tcp: sack option handling improvements Date: Fri, 18 Apr 2025 01:00:22 +0200 Message-Id: <20250417230029.21905-9-chia-yu.chang@nokia-bell-labs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417230029.21905-1-chia-yu.chang@nokia-bell-labs.com> References: <20250417230029.21905-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: AMS0EPF00000191:EE_|DBAPR07MB6760:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c01de98-317f-424f-8b00-08dd7e03bc80 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|36860700013|376014|1800799024|7416014|82310400026|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?r6sSCxXB4apqThUWb9WvTQbqNnT0+pT?= =?utf-8?q?eWu1nT7LPvGUrRA4OK0sb+vnVcK1wzqgJoGH7wO3IDzTpWtyR6M7KyPggIUk9FaMb?= =?utf-8?q?koft2EQ3CcBcgV79veuRAkJbxj0C6X4twRWf3NnwkP9KKhcXwvCopJrKSkqwXt4we?= =?utf-8?q?vfeIAYwNqAYOSFCSvvHmlQiEf35M4hbiieyE1UtqFOONladHxIhcpp3Ag2TEcT+0/?= =?utf-8?q?3XpIpL0L2Apd55SAIu3H1730aD2eaHi6kpI28xu01BYYVyc2+jsv5lTOpCO7KF5pH?= =?utf-8?q?RtdXBrvTBAAyIqDxA4v+lVidLBBYnS7p5NWIbCV5+YxnP56w0VEXAPoEm3Uv56mzC?= =?utf-8?q?zlnGtPUB4Tntoh5OC7DY1eGNyWMyqfsC7BpWDH8AbWwsdZPDZHUN+JI0rG/9PkaMP?= =?utf-8?q?dfBb3RPHigv+L5dxqOUzRt0ou6OvSXRakUC0YyMPqEAJIsoETNrFtoRLEYbiMe9SZ?= =?utf-8?q?js2DWH8qyVUj/mqxbzvuW0wT62EjUo46FVyUXLz39+OJ7B8T1GAISmz4CBYGwsO9z?= =?utf-8?q?NPSHgowIIK5qzhFUffMnlke9Nj+UU8Fbz86b2OZ4sYTg9AOcFmHHAn4Nsjue0F5fL?= =?utf-8?q?Gl/Cz9IwjIyx8RI+/jAP9yBQRjAgK4CsK/0Xi9cmePcrJEFfHcYG7v/+K+JJ7QK+/?= =?utf-8?q?MmkVyEXPRecQBGcZHxsWkAIYUXWZOxOgtiY0kMr8LM3exKkQB1BJtJzAfMDSVZhcL?= =?utf-8?q?oE4d27dXxIvRhXEajE2Aka7GfIAEDhfdpwBxfh3ihvXbtU0iYNG9QLQ0+zTxCL0ZV?= =?utf-8?q?yXpdaqRzyfkJQaDeB6uG9zIdExM09v6nzOXiLknC8IoAqiITjRDvN9GVDm2doJ14w?= =?utf-8?q?tCYXCbcSko9dVmvJRb3Rv1V6M7v3CJZ+SwsHsGKZGYqvYeC2Vwwk0aeIaRY8//YJj?= =?utf-8?q?w0MsTfv737Cib6W3TJXKsnJOOQRdWi8I/rk1WhanzhRjWl3T/nmCTaX6HVH8bJ5P6?= =?utf-8?q?PhQKqMMwOJIeQo3mcR1EkDhc/t1AhVLTrb27rc2XtFjs+No14NSbUDgSpzCLRc07h?= =?utf-8?q?A4UJYYwJ6r4TFFyMx4Xq+aiNqtLh6ngTEWVMCJSjmE3dRiB4EhXVGY7wCFnyRZ1k7?= =?utf-8?q?bNLIZh7riyUr2bbp/C/eO0Z01nLKUG4McF4fYOhUTcfSrwqWZVKEk3QNCmlDIO/fh?= =?utf-8?q?Vzmr2QRSdHYqfe04VZuT//tg2HcYcC8pyDXexBf89Tm53l77aJuMoXRC9UUwPq7jf?= =?utf-8?q?HuCOWr3z13BzBQAfKjxgUPR/5/ikGbL7xL1KppLuMqFakxSvbWsr1+K0bYNzLOrSD?= =?utf-8?q?pSv5kTs074GaLXFZnwQVG/QdAmLNs4sXKsj+9oRJCvgiYlmjaWCxqBnrlxIXw2HWs?= =?utf-8?q?dS7Aiq2h5O6wzzgst0TR2U/PFH+TvnTnX+p3D9Zn7yIRc/g/KDkpSEGohYqLR/brl?= =?utf-8?q?UTG21Ql/FXc47QhqCtPPhIMo09ogtdpl+Kld5ac0nHCNsEHTU5tCOK3yKW92elqkR?= =?utf-8?q?DgRbTeHuQFIZirChW11ClFpb1Tp/rOUQ=3D=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)(36860700013)(376014)(1800799024)(7416014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: nokia-bell-labs.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 23:01:06.8552 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c01de98-317f-424f-8b00-08dd7e03bc80 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: AMS0EPF00000191.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR07MB6760 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,