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 5768545610 for ; Fri, 12 Jul 2024 12:50:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D169402E5; Fri, 12 Jul 2024 12:50:04 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2079.outbound.protection.outlook.com [40.107.95.79]) by mails.dpdk.org (Postfix) with ESMTP id 3B0C442EDB for ; Fri, 12 Jul 2024 12:50:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B1baDEdXDoqPLx3mY0NlzVD1NynQChz/5FImPlXCuGCG4za/BoiFrXlfi/G7+xR8MC70kjn//T+cJ37EaKcS+YRs+OGFbsKI8hfIO/TNIiR55yk2SEnZcisXGCuWumII9P9srHB3I4tFvac61lWi70bSLW4mrZNu2tZrlIIDT73bkGJPuN7lbS9uBooM7yV2hMil45sV4KE7hHyu2cKktAmABVgdaifSco/iwa8A+a5gOhR9dzkSIHdEp0GrKb+NiqFqqHFuB/gNr7ak4jCz+sT3mgUnjqVYqJmzjzMgsXF6ys8GeM4Tv+ZLr07cnPWx6XTfiL997QVJb5D3cKW4ag== 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=eDzTBp0xEwU7g0OW3XPwW8kyLHJ5chHE0i4BtehDXag=; b=om5W8Xf1U7qJGyuYA+nNHY8bVTFrf/tNoI0vt/A+Gq2wIl2eeZFBucN6d8m/dpt2GFbi7dMzHlGTqQtA7sJ2dCo3hXbcUt6nYQw71wL3DcScBegP0z5f33jdfzGYd4seAROMGOpAa17D8iNFMy9CaCHU0X292AdIuXwchK1N4AZGGNX4fqElF0cjyg+WzPB21J3D1PX4oD5kVgj5tBmYRybf1iN2t3aus6vDXLVpsR8XAC0t+lSAtSGRwAJnDLFgf0Bs/WsbMCGpFlFSFbhCMAL3BwFvP1OQpeyL9D/giygBkIOGxarV1Y7XNB6VSufzmU41zreXPEvU84AYqlCFWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.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 (0) 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=eDzTBp0xEwU7g0OW3XPwW8kyLHJ5chHE0i4BtehDXag=; b=dINyUe1/5KJt5OoVIjhriiWp0USsAwNZZTNOhssKPpK9bD6TG0jnTWt8IAn4Non/es1w4Y1qDJmbwJEoeKZ2f91LP8VBz8HHGfjt+0btuJDtVTZImP3OmemfhYfj/Nt+ITnuuVe3vhmle14pEQ+8W2LSG+W3qay57zUksdAfAXFDW9wlfRUFcCj64MCIr647W3KJFXNMngZYBCAwo2rmO5sXd4JC9EhIAo1BRJpTeEL66vTRFhbI4Wf0L+zo240IiOtaD0YMkBHTrhgTO38dl4JfAN/LqwTOY7F+nEeE1nQwSlSjvs2RktNlrsqBrvA2VVktLdMUjqGRryv7C17Zog== Received: from BYAPR02CA0040.namprd02.prod.outlook.com (2603:10b6:a03:54::17) by MW4PR12MB6976.namprd12.prod.outlook.com (2603:10b6:303:20a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 10:49:58 +0000 Received: from SJ1PEPF000023D6.namprd21.prod.outlook.com (2603:10b6:a03:54:cafe::78) by BYAPR02CA0040.outlook.office365.com (2603:10b6:a03:54::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:49:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF000023D6.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:49:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:49:47 -0700 Received: from nvidia.com (10.126.231.35) 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.1544.4; Fri, 12 Jul 2024 03:49:44 -0700 From: Xueming Li To: David Marchand CC: Bruce Richardson , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ali Alnubani , dpdk stable Subject: patch 'net/ice: fix check for outer UDP checksum offload' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:28 +0800 Message-ID: <20240712104528.308638-43-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D6:EE_|MW4PR12MB6976:EE_ X-MS-Office365-Filtering-Correlation-Id: 00392e46-f095-4160-af60-08dca2605f98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Y1hLNXdTaTdKWDVPNVMwVFk1MmRHRWVKRm5tNC9RS1JwUlhQd3dpZjhJaE1P?= =?utf-8?B?WmZrb0Z1N3lDMlVFOUl3aG9Xbkk1M08xOU1rY1ZEQ3dTcU9Cd1lMOUp5OUF5?= =?utf-8?B?dVVsMTlTRUgyWFJjajM0SWtqb1Z4OEdqSDhGdm84OFBCQ3Y2SVowYlRQQUlK?= =?utf-8?B?K1JLbE9Vbm1DZ0YyeVA3YmZ1TjBaT3lRUnlwSm5xS1UrTlQ0Kyt5bU1Eek5l?= =?utf-8?B?aEJPcFV6dm5tMWkrZUttL2ZJTERvQ1VleGFBM1J6QmFiS3JDbjNCbjVnZzNh?= =?utf-8?B?U0lzYkVCN3dGc0JHVk9oaHpXNmNWOHNpSHlEMzN1Um5iSVp0bHFETGV1amFL?= =?utf-8?B?S0hFSHBDUmJsOXNZTXI1OUJML0FpVjhweFByWCs3NjYxVEZXMVZLZFVzaUVk?= =?utf-8?B?NTVGN1plSW0wNFppU3V2WEtiQkJ1cEhSUDZMUVhCSlRpOEJxeG5PRm5XWlc3?= =?utf-8?B?UGVwYnIrY2JSd3FEdnNLUmo3QTRmZGJaUzJzNy91aWZjZ3p5QkhWTmRsUkFG?= =?utf-8?B?ZzBVMWk4dzV1UkdNcnNvWlBPelgxemxpRGlEejREMXNxWVRHNEZFU2V6ZStY?= =?utf-8?B?M1JWOEZWVHM1MzhGY3gzRlprb2kzODd1S29NRk5hQ0c1aGI2akQ2RHo2VTZm?= =?utf-8?B?Vk5TRXUxVHZrb0VNdWlXS0RGL3FwdjM0T000d3Z5VUZEcFFPaTFPbkYxUGZP?= =?utf-8?B?ZHdqSXlLNzlxdzBzdEh4M1lLLzk2VkVKRU9TdzFXYTZ1UTRNZ09tc2xrRGkw?= =?utf-8?B?aUFUc2tqRTl6WWJORi82OXZHd1JmbmhXbEpuZmIyajRSQmgyZFVRUERLcnpi?= =?utf-8?B?bjVPMU1jN0Z2blN0UmxmdFhhRkZEek5IektkREZuRWcvRnFLcGNpbDBkZjY4?= =?utf-8?B?SDYycVdNWnB5Tzg3eGVUV2NQeGU1ZXlwQXFWcTlCUTZxQUcwb2JzR0lLdWQw?= =?utf-8?B?aTRXK0FtMTBoY0VQcys1c0lmUS9adlhRRk1Nazdrazc1eTc4QkYwRlBObGhS?= =?utf-8?B?T09yaUxhbWV1NHpFR3ArWSt6ZDBOcSthS25zU3dwcFhYdWhEK1dDcDJkZGtQ?= =?utf-8?B?TVo3aHBIaHd2U2pXdUU0c21kV2tnNTFJSFFOdDJ4NHM0RG01OUJ3Qkt2TGdI?= =?utf-8?B?dkdQdXBNRUxsL21ieCtGWTRlQ0QzdUVPRTN6U3hIcDByVlg4TXZmaU1RY0Zz?= =?utf-8?B?dGxXUW5FbVhuT2szUVZMbitxOWNIOE5UVW80TCt3N1BHSEdvRE9LNWVMTHRq?= =?utf-8?B?bFhJYnhQUDBkVXFzc2ptWlYvR1RLazZjcnFGOG5Qd1BUUVJkQkxzc1RpcDBa?= =?utf-8?B?eUhYVmF3bTlFQ2Fick9ObXQybUVXNjdJcUpuZmp2UHUzdHVtRlFIOFE4S0k0?= =?utf-8?B?Z0s1MzJGdHlObksvaTlGejBoWVJYanFpUFlXbUQ1ZzJqc2ppS1JTa0o5YVll?= =?utf-8?B?RHVsaVk0WHlrQkFKOFNTaUlqQmdDRTZ0UklRYTJkUGNPd1dIZlhrNms0cndJ?= =?utf-8?B?UVl2eGV6UWd0ZlhLR2JhZVNobU5nUWJPbU80Q3dGdytZcVkrSkI5ZVkyREVs?= =?utf-8?B?NVhtSmVreVowd1JWN0ZBd0hCaVRFY1c2UC9xZ1Q2NnRFTk56b0RxdnVlL2Yr?= =?utf-8?B?cEFyS2Rxd1dBQnA5Rnhid0xiN2Q0Q2hYVTdWd0QzYkJuVmczb3pQKzAxV3hT?= =?utf-8?B?V1pibGEzUVFkQVlINHkxUXhUVDBUTGxZN1ZLNFFXQ0ZNd25HdGkzUEZIQ3py?= =?utf-8?B?ZzFINStDUXQ0TWhzaXBpWmxEQmJpUU0zb3lzV1MvQk92bEJUZlVzdHNFZ2o5?= =?utf-8?B?REd0Y05oYUs2NGRuWjdMTkVicTJmRlNkOW94TVp0RUF6cnBCTG1FQWIvSm9K?= =?utf-8?B?RFlSOTA3c00wZWhoRitsdVJNZEE4blUvS3NMeVFLQ2lXMDhZNFYwRGQ5RlpO?= =?utf-8?Q?DLAJFC6l/02pzZzCdyXdtaiZqJNQ0/eo?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:58.3857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00392e46-f095-4160-af60-08dca2605f98 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6976 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c669b100ab8b5b83291698aea13e2bf2811bd951 Thanks. Xueming Li --- >From c669b100ab8b5b83291698aea13e2bf2811bd951 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 18 Apr 2024 10:20:15 +0200 Subject: [PATCH] net/ice: fix check for outer UDP checksum offload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] ICE_TX_CTX_EIPT_NONE == 0. There is a good chance that !(anything & 0) is true :-). While removing this noop check is doable, let's check that the descriptor does contain a outer ip type. Fixes: 2ed011776334 ("net/ice: fix outer UDP Tx checksum offload") Signed-off-by: David Marchand Reviewed-by: Bruce Richardson Acked-by: Morten Brørup Tested-by: Ali Alnubani --- drivers/net/ice/ice_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 73e47ae92d..dea6a5b535 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2734,9 +2734,9 @@ ice_parse_tunneling_params(uint64_t ol_flags, * Calculate the tunneling UDP checksum. * Shall be set only if L4TUNT = 01b and EIPT is not zero */ - if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) && - (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING) && - (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) + if ((*cd_tunneling & ICE_TXD_CTX_QW0_EIPT_M) && + (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING) && + (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.030001596 +0800 +++ 0042-net-ice-fix-check-for-outer-UDP-checksum-offload.patch 2024-07-12 18:40:14.026594237 +0800 @@ -1 +1 @@ -From f4eb07f031c4a6a0055f3b2773e031cd8000206e Mon Sep 17 00:00:00 2001 +From c669b100ab8b5b83291698aea13e2bf2811bd951 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 95a2db3432..10babab231 100644 +index 73e47ae92d..dea6a5b535 100644 @@ -30 +32 @@ -@@ -2751,9 +2751,9 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2734,9 +2734,9 @@ ice_parse_tunneling_params(uint64_t ol_flags,