patch 'common/cnxk: fix auth key length' has been queued to stable release 22.11.2

Xueming Li xuemingl at nvidia.com
Sun Apr 9 17:23:36 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/11/23. 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=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/6ede2ab4723fae561d2453c6d8c282c227f05ffd

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 6ede2ab4723fae561d2453c6d8c282c227f05ffd Mon Sep 17 00:00:00 2001
From: Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com>
Date: Fri, 24 Feb 2023 15:10:04 +0530
Subject: [PATCH] common/cnxk: fix auth key length
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 0fcaf90fe25ecaa002d765fa9759e554500e3f76 ]

Auth key length is stored as 8 bit value in SE context. It should
be larger enough to accommodate supported auth key length of 1024
bytes maximum, as in HMAC.

Fixes: a45859312ff ("common/cnxk: add SE definitions for symmetric crypto")

Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com>
---
 drivers/common/cnxk/roc_se.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index c357c19c0b..5b0ddac42d 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -316,16 +316,15 @@ struct roc_se_ctx {
 	uint64_t enc_cipher : 8;
 	uint64_t hash_type : 8;
 	uint64_t mac_len : 8;
-	uint64_t auth_key_len : 8;
+	uint64_t auth_key_len : 16;
 	uint64_t fc_type : 4;
 	uint64_t hmac : 1;
 	uint64_t zsk_flags : 3;
 	uint64_t k_ecb : 1;
 	uint64_t pdcp_ci_alg : 2;
 	uint64_t pdcp_auth_alg : 2;
-	uint16_t ciph_then_auth : 1;
-	uint16_t auth_then_ciph : 1;
-	uint64_t rsvd : 17;
+	uint64_t ciph_then_auth : 1;
+	uint64_t auth_then_ciph : 1;
 	union cpt_inst_w4 template_w4;
 	/* Below fields are accessed by hardware */
 	union {
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:39.527491200 +0800
+++ 0028-common-cnxk-fix-auth-key-length.patch	2023-04-09 21:45:38.609042200 +0800
@@ -1 +1 @@
-From 0fcaf90fe25ecaa002d765fa9759e554500e3f76 Mon Sep 17 00:00:00 2001
+From 6ede2ab4723fae561d2453c6d8c282c227f05ffd Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 0fcaf90fe25ecaa002d765fa9759e554500e3f76 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 6758142214..a0c97b26c5 100644
+index c357c19c0b..5b0ddac42d 100644
@@ -22 +24 @@
-@@ -288,16 +288,15 @@ struct roc_se_ctx {
+@@ -316,16 +316,15 @@ struct roc_se_ctx {
@@ -41 +43 @@
- 	struct se_ctx_s {
+ 	union {


More information about the stable mailing list