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 809DA46A63 for ; Thu, 26 Jun 2025 14:07:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 79114400D6; Thu, 26 Jun 2025 14:07:57 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2080.outbound.protection.outlook.com [40.107.102.80]) by mails.dpdk.org (Postfix) with ESMTP id 65C44400D6 for ; Thu, 26 Jun 2025 14:07:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=naz6JNY+2+zBj+I1scwc5tGaGaIb8ylO84U85TSoQJuGPctCWNdqsHTNZYPB3u3wCAmG/GDuvmRBcURaBv+f/xprY6uC3SCsXz3u3Khym0SWtB1/ZPVy4AVgrt0hXoiPhTu7WPTgGiw8J8Fy3mzD0KJIrbjB1MIGKLx3ucPbYg+/vxRYoF0D5Y0Bl4+pB8Dt595Li9wLTRljcBSoDHyvEV2xBgrE0NYfZtZYSKDIUMheNNtOizayxOIu9wCmhtx89DfVpkmg9NZQPyg0ODizZ8DYxLPJhT8iDmr4so43o23uj07KizRhQyFxYHufKDdu0IwhBMSkCaEXsu0eObIvdQ== 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=3YdhwNC5Ko7nzelFmYWaOcS3/2M3FGq/0KqVLaPQPaY=; b=nHoVMJb268Z4GSQ2tFI/mSMscGN4Ngv3F4o1aQzL1zpaxMIpH9XmU5aKiAgJuTpq4EA+3VFv1DMcLlvKTiL7A5E63HD1etTP8WmnIkP2HSYqCmzahxgFiowB50zzvIE+SmpXSkecQkyRXgH0nLBRtfFeyQm1t/Z/dQmt6Mjk+67t3owcPhznI2e3t9UPFgmUaJVM/CltI2y3lvDUP1wIAZ/QdoxVA4qmTC6htfqaZXeGSvFwymqe/0iGCpkB3cuIAI3fhqjoW84P8N1agX7U9yw57RY3eGMF7yiQuQVdGI3swNq4UDDwQfDdUQ+wMBLUFtpL5DEpZe9tf/p7iDN35w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nxp.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=3YdhwNC5Ko7nzelFmYWaOcS3/2M3FGq/0KqVLaPQPaY=; b=TvALd7gEBA8CKsxY/b0IiyHSQcC1hZu3rRG96UNtX6a7mCGPgp48JhdNJrF9n0+eCNe/LuG7LuF95e1tKRLCC8nwO1z9BIJWki9ir0R//W0c3QkzT8sIc6YdaFEtAquAraUXJhG1+WAgSDCLM4bo6fAwDsAYxggrAftw4uOrY5dExVun8orWl0awKEtyEHEH21y8eRx/V8DqPXl5+XhzC8NMKG9q7EHMQc4E9tTeJcQQ7QwR2ndCek5nviz0GnMmIP0DJiVRql7rVRObJqhsPiIwMiHRBaBGr+ti8k/H2Z50u7ToeKC58Q/y+G4O2qkXxpNupx4yNkdQBif405kHnQ== Received: from CH5PR04CA0010.namprd04.prod.outlook.com (2603:10b6:610:1f4::18) by SJ0PR12MB8137.namprd12.prod.outlook.com (2603:10b6:a03:4e5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Thu, 26 Jun 2025 12:07:52 +0000 Received: from DS2PEPF00003447.namprd04.prod.outlook.com (2603:10b6:610:1f4:cafe::ce) by CH5PR04CA0010.outlook.office365.com (2603:10b6:610:1f4::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:07:51 +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 DS2PEPF00003447.mail.protection.outlook.com (10.167.17.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:07:51 +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; Thu, 26 Jun 2025 05:07:31 -0700 Received: from nvidia.com (10.126.230.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.14; Thu, 26 Jun 2025 05:07:29 -0700 From: Xueming Li To: Gagandeep Singh CC: Xueming Li , dpdk stable Subject: patch 'common/dpaax: fix PDCP key command race condition' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:24 +0800 Message-ID: <20250626120145.27369-65-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003447:EE_|SJ0PR12MB8137:EE_ X-MS-Office365-Filtering-Correlation-Id: 7197be76-e696-4074-7c80-08ddb4aa1306 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZmZPRzBOTkpWanNGOUg3TnpITG1sUnQvMlR5Vk0xTUV1Mm9MZEx5ZDUrenlj?= =?utf-8?B?alI0QWc3bjQyMVF0MlNpUURxaVNpK3EvckJtVGpzYThlYnhUdlJBR3BBWFY5?= =?utf-8?B?YkhmOTlkWEIyNlJJUjVzcDRyeHVJU3BOWjdFUGR3QThrNHN5MUdoYnYzZWFy?= =?utf-8?B?cWg5SnQzVlFyR1BDOVRTUUR6MzRZNXlteGgyZjlPb29QY09RUDFqUHdvY1FT?= =?utf-8?B?Rmh5U0dCSUpKV1d3MndpaUM4SWtCSUJ0dDZuMkFBUVBPRTN3UDNmUG1SYXR6?= =?utf-8?B?Z3E3UnM2TFJhSnBtVGFvb0xzRmpmMzk4KzZnem9RVmx0a3RvQUhiajJqWGtZ?= =?utf-8?B?alhkL3dvR3N1SWlreUdnenArWVMvb0dqcm5qSzR3anNmZktDdTMzSUp4RU9X?= =?utf-8?B?b2E4NjE3ODEwS2VNUWI0SFdyOFU3dzFtTCtyc3o1aUxKY2RxV2E4WjluKzc0?= =?utf-8?B?c3dJY3ZmamR1L1ErOENLQnlYcnFxZEVGbEFVTmRCSlh3Vlo1UDI0cU03Vkhu?= =?utf-8?B?Q1pZR0lvQ1VwbGQ5ZTVyV0g0Q2QyTU1rNEVqR0FnSUgzdXUydzRLZXZkb25u?= =?utf-8?B?SkYyR3VxQUViaXorSnkwR1N0ME5EWmV2VDhROC9lMXhxM3dacjJsUUtKK2s0?= =?utf-8?B?SHpGYWFzaFJTYldsMzdwNWpGa2gwMHArQm5td0k1SUNONDZGbVhsck1CZFg0?= =?utf-8?B?Sk0zWERxYXEvTXlnZGlnTU9kSmxjd2wwYjdGcVNSakdmcWNSMHVMcmE4RmNj?= =?utf-8?B?L3BNVlg2bkM2NFVkSFprdENodGpNWGRWTWFqTW9wSWpmd3A3MkYzdWdhVThi?= =?utf-8?B?dVorV1ZDK2JHTDBWUTVxdkg0SDQvSUV6UHdsenJPdWVGQUhLTmh4MlBwcXF4?= =?utf-8?B?WE1zRG1iZHo0RFZvRmF4N0ttZjZ2SkR0ZmpWR2J4bVdDR3VUOFhLOFNxa0g5?= =?utf-8?B?dnRSL3k2R0ZQYWhLWStnRkRqZTBsVGxNUERJZGhBcmlhWHNZcGxUQWdWbC9O?= =?utf-8?B?NytsZlRSMEE4MDRRbGtLWEFURXdxSlhJTVcwRVc1L0pVL3VPeEgzSTZaN1Z6?= =?utf-8?B?WUFRL0cwMjIzdTVJc3hPd2lQN2VSUmpPUFV5eU1iaHFPa3ZaeVMzbzhvTTdD?= =?utf-8?B?bzN6MHBjakJFZmJOWTJhc2VVbTE4ditXZ0I1bjM1blY5TGFSYnFXcGR3a2hN?= =?utf-8?B?ZWppbUxFV3ZLUFpOUTZhUVRpQjY1aHJpSEZoSTgzRWNpR0h4VHlkUmhSZmRr?= =?utf-8?B?OWVWTU5YUkliai85TUtHUzV4MmYyQlo0ZGcvdlg3ajFsVDBCTXg3LzhESDJv?= =?utf-8?B?NG83ZWVaZXlTc0oxMFUzeUErbzhoRUJRNDl0b3d0TVVmeUFHNnZic1J6eEVF?= =?utf-8?B?MXI0UTMrOERCZmdiMDdpOGphYVVBZjFzcm5mRU9Gc3dZeGpDUFBzbDkxWkpo?= =?utf-8?B?UG8xb3o3dUE5d2EwMGI1WkllMU5wd295MXlHa0FodGV4RHE2TnRlM3ozUjYy?= =?utf-8?B?NmJUdE1uNG15OEdNaHIzeGNJeFB1K3lZdzd6UDl5ZXhSRCtRMU9yeFJScmV4?= =?utf-8?B?R0RsV3pJbkJnMUlyNlJkYmszYkZNbW56VGpnMEhiaG93VDNRT2hFZ2E5WXNQ?= =?utf-8?B?enBhVzhYVDRIei9GMWdVUXczR1hSRlBtTnhveVZrYlpxcmp4VFZNNW5BTjNM?= =?utf-8?B?U1RUeDZzWTd1V0R0eUZ0UCtjNGhnMkF0OWdRQVdMUVJEbHZ1Skh4NkpUL1Rw?= =?utf-8?B?NUVkY3VIc2pyNnFUSmZ5V0RYd2hEbW9tZkVJVHMvTXo1dGY2bmlPV1FWai8z?= =?utf-8?B?NWRGazRGblJzUXRDMFZ2R2gzajc5ODlldjFXN0s4ZEZXbWpJSVQ2L2ZVbCt6?= =?utf-8?B?d1B0Q1ZTVjBqckxVRmxsVzR5NmF1TjlKdFBCbVhYem1tb2xIRVE1T3dpYlE4?= =?utf-8?B?Nm5UL0k4MUNVSEQ4b0Y2VVkwQWFCNTJRSWVFTW5VMi9EUTFEVE1XdENpWkpJ?= =?utf-8?B?UlVJamJsOU5vbnZnQis0NU1yZ1hCRkZTVVNFdmtKejBDSzlPQndKZlJCOUM2?= =?utf-8?B?ZVhjMFZzWklMdWw0NExGT3czYjN1R2tNMm1Wdz09?= 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)(36860700013)(376014)(82310400026)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:07:51.1574 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7197be76-e696-4074-7c80-08ddb4aa1306 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: DS2PEPF00003447.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8137 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. 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=2510a08552031c49a6db3b1662355c10726e4b0e Thanks. Xueming Li --- >From 2510a08552031c49a6db3b1662355c10726e4b0e Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 21 May 2025 12:26:50 +0530 Subject: [PATCH] common/dpaax: fix PDCP key command race condition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 684faacc0fde7110c31c640669381dbf19f447f8 ] A race condition between loading the key into CAAM’s internal memory and initiating cryptographic operations can cause SEC errors in PDCP AES algorithm combinations. To mitigate this, the CALM instruction is added for the 12-bit SN case, and the older version of the descriptor is used for the 18-bit SN case. Fixes: 6127fff842a7 ("common/dpaax: remove outdated caamflib code") Signed-off-by: Gagandeep Singh --- drivers/common/dpaax/caamflib/desc/pdcp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 27dd5c4347..9a87b2c6b6 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019-2023 NXP + * Copyright 2019-2025 NXP */ #ifndef __DESC_PDCP_H__ @@ -1981,8 +1981,7 @@ pdcp_insert_uplane_no_int_op(struct program *p, KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, cipherdata->keylen, INLINE_KEY(cipherdata)); - if ((sn_size == PDCP_SN_SIZE_15) || - (rta_sec_era >= RTA_SEC_ERA_10)) { + if (sn_size == PDCP_SN_SIZE_15) { PROTOCOL(p, dir, OP_PCLID_LTE_PDCP_USER, (uint16_t)cipherdata->algtype); return 0; @@ -2747,6 +2746,7 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, (uint64_t)cipherdata->key, cipherdata->keylen, INLINE_KEY(cipherdata)); + JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); if (authdata) PROTOCOL(p, OP_TYPE_ENCAP_PROTOCOL, OP_PCLID_LTE_PDCP_USER_RN, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.208401026 +0800 +++ 0064-common-dpaax-fix-PDCP-key-command-race-condition.patch 2025-06-26 19:59:17.458418041 +0800 @@ -1 +1 @@ -From 684faacc0fde7110c31c640669381dbf19f447f8 Mon Sep 17 00:00:00 2001 +From 2510a08552031c49a6db3b1662355c10726e4b0e Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 684faacc0fde7110c31c640669381dbf19f447f8 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 9ada3905c5..f4379ede2c 100644 +index 27dd5c4347..9a87b2c6b6 100644