patch 'crypto/ipsec_mb: fix GMAC parameters setting' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

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/23/22. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/3a9281f20e36c3ccf49ad421ac99a28a650f220c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 3a9281f20e36c3ccf49ad421ac99a28a650f220c Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Date: Tue, 22 Mar 2022 13:39:10 +0000
Subject: [PATCH] crypto/ipsec_mb: fix GMAC parameters setting
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 837269c2e5c5a8813adfcf59f23b80569048ddeb ]
AES-GMAC requires plaintext length to be 0 when using AES-GCM,
so only AAD data is used.

Fixes: a501609ea646 ("crypto/ipsec_mb: fix length and offset settings")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
Acked-by: Radu Nicolau <radu.nicolau at intel.com>
Tested-by: Radu Nicolau <radu.nicolau at intel.com>
---
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
index ab9864739d..94055d8177 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -1438,9 +1438,9 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,
 					op->sym->aead.data.offset;
 			job->msg_len_to_hash_in_bytes =
 					op->sym->aead.data.length;
-		} else {
-			job->msg_len_to_cipher_in_bytes = 0;
+		} else { /* AES-GMAC only, only AAD used */
 			job->msg_len_to_hash_in_bytes = 0;
+			job->hash_start_src_offset_in_bytes = 0;
 		}
 
 		job->iv = rte_crypto_op_ctod_offset(op, uint8_t *,
@@ -1524,8 +1524,19 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,
 					op->sym->cipher.data.length;
 		break;
 #endif
-	case CCM:
 	case GCM:
+		if (session->cipher.mode == NULL_CIPHER) {
+			/* AES-GMAC only (only AAD used) */
+			job->msg_len_to_cipher_in_bytes = 0;
+			job->cipher_start_src_offset_in_bytes = 0;
+		} else {
+			job->cipher_start_src_offset_in_bytes =
+					op->sym->aead.data.offset;
+			job->msg_len_to_cipher_in_bytes =
+					op->sym->aead.data.length;
+		}
+		break;
+	case CCM:
 #if IMB_VERSION(0, 54, 3) <= IMB_VERSION_NUM
 	case IMB_CIPHER_CHACHA20_POLY1305:
 #endif
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:49.407352537 +0800
+++ 0002-crypto-ipsec_mb-fix-GMAC-parameters-setting.patch	2022-06-21 15:37:48.954450956 +0800
@@ -1 +1 @@
-From 837269c2e5c5a8813adfcf59f23b80569048ddeb Mon Sep 17 00:00:00 2001
+From 3a9281f20e36c3ccf49ad421ac99a28a650f220c Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Wed, 9 Mar 2022 10:45:14 +0000
+Date: Tue, 22 Mar 2022 13:39:10 +0000
@@ -4,0 +5 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
@@ -5,0 +7 @@
+[ upstream commit 837269c2e5c5a8813adfcf59f23b80569048ddeb ]
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
+ drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
@@ -20,5 +21,5 @@
-diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
-index c974886032..afa0b6e3a4 100644
---- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
-+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
-@@ -1296,9 +1296,9 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
+diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+index ab9864739d..94055d8177 100644
+--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
++++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+@@ -1438,9 +1438,9 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,
@@ -36,2 +37 @@
-@@ -1378,8 +1378,18 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
- 		job->msg_len_to_cipher_in_bits =
+@@ -1524,8 +1524,19 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,
@@ -40,3 +40,4 @@
--	case IMB_CIPHER_CCM:
- 	case IMB_CIPHER_GCM:
-+		if (session->cipher.mode == IMB_CIPHER_NULL) {
+ #endif
+-	case CCM:
+ 	case GCM:
++		if (session->cipher.mode == NULL_CIPHER) {
@@ -49 +50,2 @@
-+			job->msg_len_to_cipher_in_bytes = op->sym->aead.data.length;
++			job->msg_len_to_cipher_in_bytes =
++					op->sym->aead.data.length;
@@ -52 +54,2 @@
-+	case IMB_CIPHER_CCM:
++	case CCM:
+ #if IMB_VERSION(0, 54, 3) <= IMB_VERSION_NUM
@@ -54,2 +57 @@
- 		job->cipher_start_src_offset_in_bytes =
- 				op->sym->aead.data.offset;
+ #endif