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 2185146BAE for ; Fri, 18 Jul 2025 21:35:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B4F740611; Fri, 18 Jul 2025 21:35:42 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 82A4440E4C for ; Fri, 18 Jul 2025 21:35:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LSKzj0U2BrzR5Uk+AhuWGPyQnk93AgPvCr9X1AaXxUw=; b=ZZyltDYu8ahjufzAXDmHJ9mhpTqpykvF3wHhsDgjP+yRbKBZQ1WsNr9O8y8tfJYeFE6IwZ S2BvuglmEl+BKsGCpMWCkPTzZ4E6K2B9tVPPj4FQqxdD8XUUWVwwyTQr3c8HkmkK3Dfd5m ZQqukM1776SmUXO60YXbCJc718nGIRc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-wuyicdhROa-Z6DfPO-Mdxw-1; Fri, 18 Jul 2025 15:35:38 -0400 X-MC-Unique: wuyicdhROa-Z6DfPO-Mdxw-1 X-Mimecast-MFC-AGG-ID: wuyicdhROa-Z6DfPO-Mdxw_1752867338 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E255B1800165; Fri, 18 Jul 2025 19:35:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CC5C818003FC; Fri, 18 Jul 2025 19:35:36 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: dpdk stable Subject: patch 'common/dpaax: fix PDCP key command race condition' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:12 +0100 Message-ID: <20250718193247.1008129-78-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Z09M6ERxFxpYqAkH_5MnGWOLBVASmiiRou81vUBRkiQ_1752867338 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 24.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 07/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/12cf9a6edfd0173beada2311f912e303702cedeb Thanks. Kevin --- >From 12cf9a6edfd0173beada2311f912e303702cedeb 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 [ 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 9ada3905c5..f4379ede2c 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019-2023 NXP + * Copyright 2019-2025 NXP */ @@ -1982,6 +1982,5 @@ pdcp_insert_uplane_no_int_op(struct program *p, 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); @@ -2748,4 +2747,5 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, INLINE_KEY(cipherdata)); + JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); if (authdata) PROTOCOL(p, OP_TYPE_ENCAP_PROTOCOL, -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.747249309 +0100 +++ 0078-common-dpaax-fix-PDCP-key-command-race-condition.patch 2025-07-18 20:29:10.982907490 +0100 @@ -1 +1 @@ -From 684faacc0fde7110c31c640669381dbf19f447f8 Mon Sep 17 00:00:00 2001 +From 12cf9a6edfd0173beada2311f912e303702cedeb Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 684faacc0fde7110c31c640669381dbf19f447f8 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org