patch 'crypto/ipsec_mb: fix ZUC-256 maximum tag length' has been queued to stable release 22.11.2

[Xueming Li]

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 03/01/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/commit/?h=22.11-staging&id=d357ef8a3ca371bb82f53443d9a909f1050652ca

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From d357ef8a3ca371bb82f53443d9a909f1050652ca Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Tue, 31 Jan 2023 17:20:27 +0000
Subject: [PATCH] crypto/ipsec_mb: fix ZUC-256 maximum tag length
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d3802886aaa76604833da59fa2df7cd519e59982 ]

The AESNI_MB PMD supports 8 and 16 byte tag lengths for ZUC-256 when
intel-ipsec-mb version is 1.3 or newer.
The conditional check to enable these tag lengths had the incorrect
operator, which enabled 8 and 16 byte tag lengths for versions below 1.2,
which is not supported.

Fixes: 7babda4316f9 ("crypto/ipsec_mb: support all tag sizes for ZUC-EIA3-256")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Reviewed-by: Brian Dooley <brian.dooley at intel.com>
---
 drivers/crypto/ipsec_mb/pmd_aesni_mb.c      | 2 +-
 drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
index 147a38932d..ac20d01937 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
@@ -199,7 +199,7 @@ aesni_mb_set_session_auth_parameters(const IMB_MGR *mb_mgr,
 			}
 		} else if (xform->auth.key.length == 32) {
 			sess->auth.algo = IMB_AUTH_ZUC256_EIA3_BITLEN;
-#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM
+#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM
 			if (sess->auth.req_digest_len != 4 &&
 					sess->auth.req_digest_len != 8 &&
 					sess->auth.req_digest_len != 16) {
diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
index 55fafbbbec..8a7c74f621 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
@@ -566,7 +566,7 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {
 				},
 				.digest_size = {
 					.min = 4,
-#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM
+#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM
 					.max = 16,
 					.increment = 4
 #else
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:42.836380500 +0800
+++ 0060-crypto-ipsec_mb-fix-ZUC-256-maximum-tag-length.patch	2023-02-27 14:08:40.789237000 +0800
@@ -1 +1 @@
-From d3802886aaa76604833da59fa2df7cd519e59982 Mon Sep 17 00:00:00 2001
+From d357ef8a3ca371bb82f53443d9a909f1050652ca Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d3802886aaa76604833da59fa2df7cd519e59982 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org