[dpdk-stable] patch 'app/crypto-perf: fix input of AEAD decrypt' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. 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.

Thanks.

Luca Boccassi

---
>From c3889cce9b23ffa8ca1a0ce49b87f6ee3646d476 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana at marvell.com>
Date: Thu, 21 Nov 2019 16:44:27 +0530
Subject: [PATCH] app/crypto-perf: fix input of AEAD decrypt

[ upstream commit 7f9816b9b2589625cb4b0e98a3d770c44717d633 ]

In AEAD decrypt (verify mode), test data should point to
cipher text instead of plain text

Fixes: 5b2b0a740fba ("app/crypto-perf: overwrite mbuf when verifying")

Signed-off-by: Archana Muniganti <marchana at marvell.com>
Acked-by: Anoob Joseph <anoobj at marvell.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 app/test-crypto-perf/cperf_test_verify.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c
index 6945c8b4ce..29356422ad 100644
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -230,11 +230,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
 {
 	uint32_t segment_sz = options->segment_sz;
 	uint8_t *mbuf_data;
-	uint8_t *test_data =
-			(options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
+	uint8_t *test_data;
+	uint32_t remaining_bytes = options->max_buffer_size;
+
+	if (options->op_type == CPERF_AEAD) {
+		test_data = (options->aead_op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?
 					test_vector->plaintext.data :
 					test_vector->ciphertext.data;
-	uint32_t remaining_bytes = options->max_buffer_size;
+	} else {
+		test_data =
+			(options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
+				test_vector->plaintext.data :
+				test_vector->ciphertext.data;
+	}
 
 	while (remaining_bytes) {
 		mbuf_data = rte_pktmbuf_mtod(mbuf, uint8_t *);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:31.580530956 +0000
+++ 0132-app-crypto-perf-fix-input-of-AEAD-decrypt.patch	2019-12-19 14:32:26.337302426 +0000
@@ -1,13 +1,14 @@
-From 7f9816b9b2589625cb4b0e98a3d770c44717d633 Mon Sep 17 00:00:00 2001
+From c3889cce9b23ffa8ca1a0ce49b87f6ee3646d476 Mon Sep 17 00:00:00 2001
 From: Archana Muniganti <marchana at marvell.com>
 Date: Thu, 21 Nov 2019 16:44:27 +0530
 Subject: [PATCH] app/crypto-perf: fix input of AEAD decrypt
 
+[ upstream commit 7f9816b9b2589625cb4b0e98a3d770c44717d633 ]
+
 In AEAD decrypt (verify mode), test data should point to
 cipher text instead of plain text
 
 Fixes: 5b2b0a740fba ("app/crypto-perf: overwrite mbuf when verifying")
-Cc: stable at dpdk.org
 
 Signed-off-by: Archana Muniganti <marchana at marvell.com>
 Acked-by: Anoob Joseph <anoobj at marvell.com>
@@ -17,10 +18,10 @@
  1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c
-index bbdf37d051..833bc9a552 100644
+index 6945c8b4ce..29356422ad 100644
 --- a/app/test-crypto-perf/cperf_test_verify.c
 +++ b/app/test-crypto-perf/cperf_test_verify.c
-@@ -203,11 +203,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
+@@ -230,11 +230,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
  {
  	uint32_t segment_sz = options->segment_sz;
  	uint8_t *mbuf_data;