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 0C0E646A63 for ; Thu, 26 Jun 2025 14:08:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 067E2402A8; Thu, 26 Jun 2025 14:08:17 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2084.outbound.protection.outlook.com [40.107.212.84]) by mails.dpdk.org (Postfix) with ESMTP id CDD50400D6 for ; Thu, 26 Jun 2025 14:08:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oAZPeZIe+3R7TdQdmXyY7tAvlRggAKNOMUsQETncV3FYmlwKbHK+v9QEt9Se1v70HbMJHSggOqjwdq29Kr5I9X915yI7Nz2jKtiR6SXtv3eStH+CkfYBZLjrWzOffTmhcwW3Q6qGhuSlL3kJcclkxaq806KBHPPPmcEJ9foXpKPl8/0lv6VYor42kHAP0yR49HqCCTs84OIZhQ0KsrR+Jyjq1SPKTfKvHZ5qtpfKt3cHZWaqYb/AUaueefxhG2uaQaKAFD5Lq+m42KxMkA9R81NuRrvt5Bo6J/2rWMSqGYmWwo2squNQMzVA3P09MGQzbKLyw67ThKo+RUmLQu2MwA== 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=JDmBpqexLwBWU8hDXZ63TiChsdGyv42yf+tB0zadHJc=; b=ml5HoyjNpw7LVgsOSNnDLOaK8Z0yMgq8ecq4lTrzlZFeye5pqTSvRy4hAf4l+J5qSAmJ7BlPYSCtFsG+T3eyNIdmKQVK45EhxOw5ljAKTga9A3sKoynzXUL8F75twh85+rZ7wE4cO7gB4OVOZySW5XA5YBGguFP0qbs/O/Oy/oI8ZMpT2gqcehGLRzNWKmUesp8mpS8bsJRZTIefadRKXPP9g6O0tMhyN3WzANIS5mhmmnvcPXQH44TQRSJQQZB12qAp8yDGtQ007EP8CRx6KKuuJI1/lyVQGFJq6StXNVkeBdSCHQNtfYnyFyHDKXUrIevtY65e3p8VHnY6d3YLyg== 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=JDmBpqexLwBWU8hDXZ63TiChsdGyv42yf+tB0zadHJc=; b=Lx2TYw+xiggfcOCCT815VmIcTzQQbu22T0Rr7o52WGiFtHkHE57quGiHo4ohzDY5tdz5hR5lIGzRfvQqnwTLoWec0vcdLoaSYD5hpDGTh0uVkzgB6fAIMnrSsUYjGmGaSJH9wBUqlN8nNcJQyhyYPZmW8mnKoGimeH+MYI2L+n5rETUnmnNB6kpyQVhCJ68Tl8eFpT5iSJZ3zPQ5aQzDdQxPKQfrTRLQb8sB5wBpo77oe+YYADdidc59104JzMqp64G4XhbfsSRLmIPwOAEb5YEpl4DI4mJJyhIuKC1OClJzRcBTKxBhUlsc4BfpjjdRVJSLdfqsdVNE4FTVIU6gfA== Received: from YQZPR01CA0111.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:83::16) by IA1PR12MB8466.namprd12.prod.outlook.com (2603:10b6:208:44b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Thu, 26 Jun 2025 12:08:11 +0000 Received: from DS2PEPF00003446.namprd04.prod.outlook.com (2603:10b6:c01:83:cafe::f9) by YQZPR01CA0111.outlook.office365.com (2603:10b6:c01:83::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.20 via Frontend Transport; Thu, 26 Jun 2025 12:08:10 +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 DS2PEPF00003446.mail.protection.outlook.com (10.167.17.73) 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:08:10 +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:50 -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:49 -0700 From: Xueming Li To: Gagandeep Singh CC: Xueming Li , dpdk stable Subject: patch 'common/dpaax: fix PDCP AES only 12-bit SN' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:25 +0800 Message-ID: <20250626120145.27369-66-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-Transfer-Encoding: 8bit Content-Type: text/plain 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: DS2PEPF00003446:EE_|IA1PR12MB8466:EE_ X-MS-Office365-Filtering-Correlation-Id: 81fc80f7-9874-426d-0a50-08ddb4aa1e9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nPp9ojou317F/HyuV9AC62XesgUnyqercEqkbsZliE1Dw8G0WtU1QUZMJlYf?= =?us-ascii?Q?i8lo8vqWs3ZcraOBKVmI3H6WlOsFQsseJIgMX0QGHT8vB0GCx5AE4V/m1kXj?= =?us-ascii?Q?xtIeJtwEMeL7a1+V7NoJbqbRfkFTaPtVS3Moqya42jtdvw3TPD1SRgWwYllB?= =?us-ascii?Q?ZpjW7ag62pYf116s5sUQMJxNl3crSLvoHfsxuc3z0HzOX4VKjIrV2ww6IwhW?= =?us-ascii?Q?4bl/Wf+JDr84SubyRRdms1gTkjiAna5ey1CGJ6H3USxBl8ZRq8wPFMqE12vs?= =?us-ascii?Q?kepeTBEzNsOszkfN/67ZoB1ozkISVHj0ZuPJ0CNpwzBDjkKsgwk1o1y9F2V8?= =?us-ascii?Q?SEMHXmvw0KE3Ik2jswWelc2gEG5t+37N6+PcLA5T6QNTrfcTBzPGW3ffxTnC?= =?us-ascii?Q?/SwP+qWqBUef1owfwntqYWbrRM0PdqPz5UxCgl583agtpMvNChc6JJdTCdsl?= =?us-ascii?Q?0n1s3Sc5hSVH8pb3+cOmIGZK6BjHUZuhH9rCPE+ex8hXTU3I+MDNjPBwAy5l?= =?us-ascii?Q?GV+AmOYj0ai0jw3vQ835taOPVZoFsulJp+zsMYiqqMEPPVQYmQGoH0iNDNUX?= =?us-ascii?Q?BUQE6SvCzioWT+uCZ7RPy/v1enkvralZlwaaVb+9qlMmf++NxFqmmNHAU+uN?= =?us-ascii?Q?ensgdKTBnTgw8RN6KWgWTywzFnNpl6HlIg/ml4lrC1YcQsXudJ5sx9Idh69q?= =?us-ascii?Q?7lWl7iQ63x1Ai4AQQallHbsv7dxVLlorsrsiBmWL+PW3We3Oh790BS40zHha?= =?us-ascii?Q?Zoon081/uiJMRn7SVXEOmHVQV1vp7KyoTNYML20IYIoVjk8526vVAeCz94zi?= =?us-ascii?Q?Br8RmLdhGqvF153hqZ4CHzspe4WKW9ZlR679IdpyvC5877h8aRv86XBBWeqv?= =?us-ascii?Q?xjKrP7Rq7HFoYaCuXHUAuzCYZJUdOYM+3QJsQ68uq3VcqOCmi5wxjfVPy3dO?= =?us-ascii?Q?aN9kb7ba7+WET6Q1+ZfpzGi8mtmufGHO58tANAsCbQyW/diaA5kRoKulrfMV?= =?us-ascii?Q?FabLyYGKwDw6gAqiu2FquecMZSvtHs4IKYUvIoVUMwBTjfeHBQkG6wc2Se1p?= =?us-ascii?Q?KtNEbtnd6BRhOueaBrFoWxtwAspD/rQb0ThZ9O+smNBOCTCmj6H2Fd0lVbwp?= =?us-ascii?Q?fpVhO9p20bpkCYarUzK4GpXjXV6O4za5T9Oz+t+Ko1L9m3bBgsudwn03K9JP?= =?us-ascii?Q?tvwqx/mw11wI17vHRHBKs16UaRxVCb5EUhcPyzFcSBBDwKjWf6ZYhTINnQTT?= =?us-ascii?Q?cXDVEol//mxuXTaYMFVfEUBZEpVN6eA33FmwGKd4r3KSIqxZFYJIkLb5zkNk?= =?us-ascii?Q?WbinSWkj9Dy2IAjhPVMdhmKEyL3RnKotLZ5ggknKXqjjH+KXtbj+YMCb2uYq?= =?us-ascii?Q?uZYtux3muSMixI+ZLLfmCOFduROotH9ag+cUMCTVTby//TzLr2kv7IvaE+R1?= =?us-ascii?Q?Bg79IsIs3jDT7XAj/5dBJXmXRcyejapqFonI2Aj76/eszdiu1wuw920J/FSe?= =?us-ascii?Q?VfvppaIHVtvJlaCqXCoB+GfqkDM2zbM/HSuKrf89Ib6HI7vSD70iCYBMsQ?= =?us-ascii?Q?=3D=3D?= 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)(376014)(82310400026)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:08:10.5972 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81fc80f7-9874-426d-0a50-08ddb4aa1e9b 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: DS2PEPF00003446.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8466 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=0b7a18a4432e4dbf0ac84257d63399581600e42e Thanks. Xueming Li --- >From 0b7a18a4432e4dbf0ac84257d63399581600e42e Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 21 May 2025 12:26:51 +0530 Subject: [PATCH] common/dpaax: fix PDCP AES only 12-bit SN Cc: Xueming Li [ upstream commit f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 ] This workaround fixes the invalid key command SEC error. Fixes: 6127fff842a7 ("common/dpaax: remove outdated caamflib code") Signed-off-by: Gagandeep Singh --- drivers/common/dpaax/caamflib/desc/pdcp.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 9a87b2c6b6..dc5f7cedff 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -619,7 +619,7 @@ pdcp_insert_cplane_enc_only_op(struct program *p, KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, cipherdata->keylen, INLINE_KEY(cipherdata)); - if ((sn_size != PDCP_SN_SIZE_18 && + if ((authdata && sn_size != PDCP_SN_SIZE_18 && !(rta_sec_era == RTA_SEC_ERA_8 && authdata->algtype == 0)) || (rta_sec_era == RTA_SEC_ERA_10)) { @@ -631,6 +631,7 @@ pdcp_insert_cplane_enc_only_op(struct program *p, (uint16_t)cipherdata->algtype << 8); return 0; } + /* Non-proto is supported only for 5bit cplane and 18bit uplane */ switch (sn_size) { case PDCP_SN_SIZE_5: @@ -2719,7 +2720,7 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, case PDCP_CIPHER_TYPE_AES: case PDCP_CIPHER_TYPE_SNOW: case PDCP_CIPHER_TYPE_NULL: - if (rta_sec_era == RTA_SEC_ERA_8 && + if (rta_sec_era >= RTA_SEC_ERA_8 && authdata && authdata->algtype == 0){ err = pdcp_insert_uplane_with_int_op(p, swap, cipherdata, authdata, @@ -2729,6 +2730,17 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, return err; break; } + if (rta_sec_era >= RTA_SEC_ERA_8 && + cipherdata->algtype == PDCP_CIPHER_TYPE_AES + && !authdata + && sn_size == PDCP_SN_SIZE_12) { + err = pdcp_insert_cplane_enc_only_op(p, swap, cipherdata, + authdata, + OP_TYPE_ENCAP_PROTOCOL, sn_size); + if (err) + return err; + break; + } if (pdb_type != PDCP_PDB_TYPE_FULL_PDB) { pr_err("PDB type must be FULL for PROTO desc\n"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.239639625 +0800 +++ 0065-common-dpaax-fix-PDCP-AES-only-12-bit-SN.patch 2025-06-26 19:59:17.462418041 +0800 @@ -1 +1 @@ -From f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 Mon Sep 17 00:00:00 2001 +From 0b7a18a4432e4dbf0ac84257d63399581600e42e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ -index f4379ede2c..c90eff26a8 100644 +index 9a87b2c6b6..dc5f7cedff 100644