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 A67AF46BAE for ; Fri, 18 Jul 2025 21:35:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9BA6A40E68; Fri, 18 Jul 2025 21:35:45 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 48A4440E42 for ; Fri, 18 Jul 2025 21:35:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867343; 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=qtZlAvSr/z/xl4DZZds4BmCT/LsqT9+hJGHP3fGDTWY=; b=XY4psohsqzUZ2KtXBfrAsqHgC4Mmx+EPvNLUQ47QcL7BletZDBwY32RFnE6svLTLj9/cOA hziLYhloem8BRmHtnH1yaey/jYvkDqg6+73CLFOWK6DAgTEN7Z83jeUp7H02n9XnFb8+Xs gA7UStaiYgsjRMEcG5eG4p3b7WuJDIM= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-nrG2JDyeMVebG5Mtc8lMTQ-1; Fri, 18 Jul 2025 15:35:40 -0400 X-MC-Unique: nrG2JDyeMVebG5Mtc8lMTQ-1 X-Mimecast-MFC-AGG-ID: nrG2JDyeMVebG5Mtc8lMTQ_1752867339 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC404193E88A; Fri, 18 Jul 2025 19:35:39 +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 8CE5B18004AD; Fri, 18 Jul 2025 19:35:38 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: dpdk stable Subject: patch 'common/dpaax: fix PDCP AES only 12-bit SN' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:13 +0100 Message-ID: <20250718193247.1008129-79-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: e0t2bOIwAvhG_YY0uCegJuIQpH54p9DYkLm0npmmvTc_1752867339 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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/13accd53baf6dbd893be30be5337256ddeb7f692 Thanks. Kevin --- >From 13accd53baf6dbd893be30be5337256ddeb7f692 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 [ 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 f4379ede2c..c90eff26a8 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -620,5 +620,5 @@ pdcp_insert_cplane_enc_only_op(struct program *p, 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)) @@ -632,4 +632,5 @@ pdcp_insert_cplane_enc_only_op(struct program *p, return 0; } + /* Non-proto is supported only for 5bit cplane and 18bit uplane */ switch (sn_size) { @@ -2720,5 +2721,5 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, 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, @@ -2730,4 +2731,15 @@ cnstr_shdsc_pdcp_u_plane_encap(uint32_t *descbuf, 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) { -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.778291944 +0100 +++ 0079-common-dpaax-fix-PDCP-AES-only-12-bit-SN.patch 2025-07-18 20:29:10.983907493 +0100 @@ -1 +1 @@ -From f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 Mon Sep 17 00:00:00 2001 +From 13accd53baf6dbd893be30be5337256ddeb7f692 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org