From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8619F4301F for ; Thu, 10 Aug 2023 02:11:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FBDD40DD8; Thu, 10 Aug 2023 02:11:48 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2040.outbound.protection.outlook.com [40.107.237.40]) by mails.dpdk.org (Postfix) with ESMTP id A7C06406B6 for ; Thu, 10 Aug 2023 02:11:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZT3mOVn8EDr4qsQIJglJQd3goQr2ZB+U+JTEwVP5aKgcgC1eTHTVPKTGgVhP4+1mOfHYWp5qIVkNp+RFmNLMDW7qHiLqrVXOJREvugAhz1F5TJoHgcSBt4hnN8Pb0GIB7cNLcup6mHwVPcOfZOUjb03uWW88Y/SSB4Hl2jlTfXv/7DZj6RMPd8wvwTIYcwxnvJO2P3+WeatmxhghRi5QHfLgdQ7DyyL4r5LaPxMDB0AOH6nayRIbKjhldSvhkbd5y6dPC0cGMs1ESaVeLWT32WzpbbvR8s1d6rE2xkryf8zp/WzZNPto2aYxcCP0ApFl0KckNPMkP8nqtAV+l7DCUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=RXQVVJx527o0jSFUZBH+uM24sGBwXW8mh+fN/cnmHeE=; b=BKRAae+3JO2SEZlx4aVxZTPs+LJGMourcJAfHqkM1oZ4AtotLuXg0XNvRAlxkmo1XU65cE7FutnDOjkJvWBZQ9QnnVu8TwQ03NbB+LnPUWKTBFysAR9vr2E91xuv6sDjP1YVGxuFbh2ZKr7r7edpeBjO0zAdljeAxL1TreGth9uU9lZ38AiMMomV4RjCzicfsgF3g1JFat8hW8S7Gnvz+Gw2+E3GmQzzPHOJaVz4PgTutmmqhlheHa35yksBvqFAnzskXPLhKrNPv2BpvgCywINR80s/sGyh8Vo5st71TkqgW2Gc9mMOun9VR4xKBLUARlMxcFjnlGv8BgmMHmUlww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RXQVVJx527o0jSFUZBH+uM24sGBwXW8mh+fN/cnmHeE=; b=n94jwv2KAQQZmFn8HoEurla/TpE8+hMCWLFhBtHRL+VwdPbdTbTELFA6mRuBHmVa6jATl/brB4wWUITbmsVoprUm6yCPEIFJjt3jVt36vGDDlsabGk4WmzkGviUQ8SHYpH7pIcpSgz4U3HmN6mgPYIi3yvIOu4pMO9RadYZ/czN0qTgSIB0L7+76Leo+pngJzkQ5BElOLUzApfe3beWCxXslwS6WwZ6pAaspPsDTw8tQEZTIH0jEiEPFh8VP6m0MxGfoumqC4gMy9zLZeLi1HtUpMEu2vs5tAEetWQwrXm/+/yg0ZFsbMxyB1HqSsTYxCseZBTw3bRMDQ5xG59XKCw== Received: from MW4P223CA0017.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::22) by MW3PR12MB4347.namprd12.prod.outlook.com (2603:10b6:303:2e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:11:45 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:303:80:cafe::3b) by MW4P223CA0017.outlook.office365.com (2603:10b6:303:80::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.29 via Frontend Transport; Thu, 10 Aug 2023 00:11:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:11:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:11:28 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 17:11:26 -0700 From: Xueming Li To: Heng Jiang CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix LRO TCP checksum' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:30 +0800 Message-ID: <20230810001045.2662-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F2:EE_|MW3PR12MB4347:EE_ X-MS-Office365-Filtering-Correlation-Id: 9554a210-e890-4d9b-8044-08db99366131 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BiqEWH0tBZeu2Hb8wM/HO0mbO/C1XmfkinugVjkF6cesqDkZlODl8su0dcJMU2uyigVVui75zMOo1lZ5anwkM2EhwDz/nqwenxSH0Zsp8k7LQArjPC/qy62ggbpz88nOrmCY0AxSi0er6FurSdIFF8YSKXuCxELfneG2yt6EwOyKw9zLUHoVazlj9bJKpkjXRrdKN/c34cr8aHxU0XIN/mVoAxON1Ur9ePDY93rXTxZIs2JI/eCcpwkQY1F0rEq/eweJiOFijQQQZTFw3CCAmGOXLaD/26lYrCgNydfDaS6uL/piQX1agNcSUsD6y46it0QH67vQfu2ciMORud8GCG+6Pmy1Xzkl4Vm3xUzS6MrTndpWx6fk6taRNZZZhXIQUG+wFE8TocvzLrLtkxLN9whyTYCz5k0DtCb4bLWJARzqIHeTS0OSp7Ej52UMLXfcg5EjuSGyKENFrW9ZE45hJP3EVpQ9wtQFUc9svD7zlTFayywZrK9aeDfuItw+dPWeivqyfOe9hcuYmhs35Jqz9SMS1j+RE5tUbfiA+Rz4TNBWSYypSQwFL1OU+O2WGczHyZkZoL/QEZTmAc7y3BX7CSYltnV6Qq2yuN5ESohBGU2UH5FnCXSaFaIsnor+oNOJbt7uR/npWH5nvBcckZ5GjuPk3QhdWcaanqnXrQKEKmkUuw6t/R8ovvKRDK4BmuRaNBMlUnnUkYMYsoDwdAdxaLz2z5PlY8AiysZlLiOc1j/kucifWmWqD1rZErAJIDvzLmWGGaFNRI3JSNWRhFLscA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199021)(82310400008)(186006)(1800799006)(36840700001)(46966006)(40470700004)(426003)(2906002)(316002)(1076003)(53546011)(82740400003)(55016003)(336012)(6286002)(16526019)(8936002)(36756003)(8676002)(41300700001)(47076005)(26005)(40460700003)(40480700001)(83380400001)(54906003)(966005)(86362001)(7696005)(2616005)(478600001)(70586007)(6666004)(70206006)(6916009)(4326008)(5660300002)(7636003)(356005)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:44.0037 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9554a210-e890-4d9b-8044-08db99366131 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4347 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=1a59660e4d610955a2c5ffe5e36da8a9e3417310 Thanks. Xueming Li --- >From 1a59660e4d610955a2c5ffe5e36da8a9e3417310 Mon Sep 17 00:00:00 2001 From: Heng Jiang Date: Tue, 18 Jul 2023 11:56:13 +0300 Subject: [PATCH] net/mlx5: fix LRO TCP checksum Cc: Xueming Li [ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ] The variable csum is the sum of three 16 bits integers, the max value is 0x2FFFD. The corner case of sum of 3 is 0x1FFFF gives the wrong result: 0x1 + 0xFFFF = 0x10000, the upper 16 bits are not 0. It must be folded again to ensure that the upper 16 bits are 0. Fixes: e4c2a16eb1de ("net/mlx5: handle LRO packets in Rx queue") Signed-off-by: Heng Jiang Acked-by: Viacheslav Ovsiienko --- .mailmap | 1 + drivers/net/mlx5/mlx5_rx.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index f483c8cd69..6032ae9ea2 100644 --- a/.mailmap +++ b/.mailmap @@ -483,6 +483,7 @@ Helin Zhang Hemant Agrawal Heng Ding Hengjian Zhang +Heng Jiang Heng Wang Henning Schild Henry Cai diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c index 99a08ef5f1..b41f7a51f5 100644 --- a/drivers/net/mlx5/mlx5_rx.c +++ b/drivers/net/mlx5/mlx5_rx.c @@ -1045,6 +1045,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, tcp->cksum = 0; csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4); csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff); + csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff); csum = (~csum) & 0xffff; if (csum == 0) csum = 0xffff; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:21.042069800 +0800 +++ 0113-net-mlx5-fix-LRO-TCP-checksum.patch 2023-08-09 21:51:18.284352000 +0800 @@ -1 +1 @@ -From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001 +From 1a59660e4d610955a2c5ffe5e36da8a9e3417310 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 9ce554451b..864d33ee46 100644 +index f483c8cd69..6032ae9ea2 100644 @@ -25 +27 @@ -@@ -496,6 +496,7 @@ Helin Zhang +@@ -483,6 +483,7 @@ Helin Zhang @@ -34 +36 @@ -index 71c4638251..392784050f 100644 +index 99a08ef5f1..b41f7a51f5 100644 @@ -37 +39 @@ -@@ -1090,6 +1090,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, +@@ -1045,6 +1045,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,