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 3F892468E4 for ; Thu, 12 Jun 2025 23:10:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3AFDD42E0C; Thu, 12 Jun 2025 23:10:49 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 9730042E0C for ; Thu, 12 Jun 2025 23:10:47 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a4f72cba73so1869895f8f.1 for ; Thu, 12 Jun 2025 14:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762647; x=1750367447; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lJfMvZLUBrF/Do4qx0w4yxFRGcjHO8L5unClDV76Hg4=; b=UPADlvOZGH+qZhwzhpWqCO70NN7VUOwI4NSHO5QMNmJ7MO7pPu9b7+jxIES6JO/piL vA5OTG/vP2czCYMgGfNdbFv7l5NcEQ/Zub2zuC77oKGFLALErpO4W9UVS2II/ETo96FU 9PgfT64r1giHDF1EU3/fbmcmGX0PTWVnIDMK9Dh2aLt1zvd8fHQFcBOjWW14QHf18qlf kIlBdiFNGaDNDs54CXHo7W1Yk7xD/tOZCiyHuKzpkju90dBEJSU9GkR/ZbZJgSKsMKjH tpOOK0YigztYXDSi+gpELwUK5cvCb9GpJ2u2TFLZel/L6+IK1EY5W2LIkzH4ZnYBFeIS Gc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762647; x=1750367447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lJfMvZLUBrF/Do4qx0w4yxFRGcjHO8L5unClDV76Hg4=; b=ugQ7q7G2aHYKM7deJXhHiJcGXo/9hLsp+jMHf9UgCzLd1w5/kzZazUAF77LBTzxqIg pYyVfQ4WvzwZRJ5ihkF39wbeliL5h6Xkvgevcig02GGXUF8SnEx94i8fgvfdxIoUtT8c Smb3UK02BYcXdlMeDy9+U6RUZfh+e6wnlBl1ZBQR0Nv0g2Mw6BcZPNfrzQ4F8k5FuXd2 AgeSlxHhGL2fgZ6mZwsqxJAJbyaDQPRgAqInS22S3KeOL71e9nr3a1Nuz9NOYqim8wtT u2ATQl56ulT59UQk3OH5wlm0jD+WRjUMdLoV3yWtV5g5mObfKNwHguTRteUhTstKVMTh xm7Q== X-Gm-Message-State: AOJu0YxVVUW2uCz0q3QdKviLfetKeMX5oJ5QWddBe6PcfMtYkOtHmK9S y41WwZbonho2NjTuELl/5JE8aY3uOSrMUZl+6nhwOjkLGCPyX/0R702atQiQgzXW X-Gm-Gg: ASbGncvAI+orNqxbERuD6xIzbVcvHF6fhhmk2nQ+1TCdNcPRWPh+dZldpDvL9H1G8yJ SFwWhsjj7tBd7OUbg/FGAq4xL8FSht/Jj6kO03lN7HUwsmq2TRqywiG6ozO3v5/glv0AfDZ67/z rrEyCE+3sNmCSVNyba6rTBpRACw4LTylDCV/baqmYkWNL6PGenDgUH+DQnEKwco5+UkCSSIXTQC 1JL/V3bief7/YDaxyxyNhCyE8CmNIepkLkmhbm+yFd7BQlOI5IriBBNNJYRLkqYm4FCLMCotqjG FW8e5wuCk3QfIWkYgc9UYc4O9W1VvMMfqyo3CWAJ9t3OktK9qfGqKtav5XjTGzFB7YHU X-Google-Smtp-Source: AGHT+IEWD0dHUrBO2QoxXSYSW77UGBEGfXSIK3bbA46OnhvshllavC2ljcggU8pfzDj4ZE02NQZKmQ== X-Received: by 2002:a05:6000:4007:b0:3a4:dc3b:5a3b with SMTP id ffacd0b85a97d-3a56a2c3feamr51797f8f.10.1749762647062; Thu, 12 Jun 2025 14:10:47 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568a54d7fsm407016f8f.18.2025.06.12.14.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:46 -0700 (PDT) From: luca.boccassi@gmail.com To: Gagandeep Singh Cc: dpdk stable Subject: patch 'common/dpaax: fix PDCP AES only 12-bit SN' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:13 +0100 Message-ID: <20250612210733.2506558-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.11.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/31557339dfd6496a3fd4aee2b065c4bcd913c7a6 Thanks. Luca Boccassi --- >From 31557339dfd6496a3fd4aee2b065c4bcd913c7a6 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 4eff326738..dbeb013f1c 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.919861769 +0100 +++ 0056-common-dpaax-fix-PDCP-AES-only-12-bit-SN.patch 2025-06-12 22:06:23.886044975 +0100 @@ -1 +1 @@ -From f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 Mon Sep 17 00:00:00 2001 +From 31557339dfd6496a3fd4aee2b065c4bcd913c7a6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f0ccfc4ddc7a01f4544b8a2913cc3d3f7c8b8832 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index f4379ede2c..c90eff26a8 100644 +index 4eff326738..dbeb013f1c 100644