[dpdk-stable] patch 'test/crypto: copy offset data to OOP destination buffer' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 06/14/21. 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/07d17061abb9f5e2caa0402738abca1dc1b99a84

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 07d17061abb9f5e2caa0402738abca1dc1b99a84 Mon Sep 17 00:00:00 2001
From: Kai Ji <kai.ji at intel.com>
Date: Wed, 5 May 2021 15:45:13 +0100
Subject: [PATCH] test/crypto: copy offset data to OOP destination buffer
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit e19deb5af6edab846197dbd4f3cbbb2b83b3784f ]

Copy over the offset data required for auth in out-of-place op
when auth offset and cipher offset are not aligned.

Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR-CMAC")

Signed-off-by: Kai Ji <kai.ji at intel.com>
---
 app/test/test_cryptodev.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 093324ce73..56b385bdf1 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2630,6 +2630,21 @@ create_wireless_algo_auth_cipher_operation(
 	iv_ptr += cipher_iv_len;
 	rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
+	/* Only copy over the offset data needed from src to dst in OOP,
+	 * if the auth and cipher offsets are not aligned
+	 */
+	if (op_mode == OUT_OF_PLACE) {
+		if (cipher_offset > auth_offset)
+			rte_memcpy(
+				rte_pktmbuf_mtod_offset(
+					sym_op->m_dst,
+					uint8_t *, auth_offset >> 3),
+				rte_pktmbuf_mtod_offset(
+					sym_op->m_src,
+					uint8_t *, auth_offset >> 3),
+				((cipher_offset >> 3) - (auth_offset >> 3)));
+	}
+
 	if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
 		cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
 		cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:59.040165100 +0800
+++ 0094-test-crypto-copy-offset-data-to-OOP-destination-buff.patch	2021-06-12 06:53:56.440000000 +0800
@@ -1 +1 @@
-From e19deb5af6edab846197dbd4f3cbbb2b83b3784f Mon Sep 17 00:00:00 2001
+From 07d17061abb9f5e2caa0402738abca1dc1b99a84 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit e19deb5af6edab846197dbd4f3cbbb2b83b3784f ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index a677a21e36..2bd4ff96cb 100644
+index 093324ce73..56b385bdf1 100644
@@ -21 +23 @@
-@@ -2629,6 +2629,21 @@ create_wireless_algo_auth_cipher_operation(
+@@ -2630,6 +2630,21 @@ create_wireless_algo_auth_cipher_operation(