patch 'test/crypto: fix out-of-place SGL in raw datapath' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/98ece68514f878ca3f59af43e2c9ead871f02d0a

Thanks.

Kevin

---
>From 98ece68514f878ca3f59af43e2c9ead871f02d0a Mon Sep 17 00:00:00 2001
From: Kai Ji <kai.ji at intel.com>
Date: Fri, 7 Jan 2022 15:06:04 +0000
Subject: [PATCH] test/crypto: fix out-of-place SGL in raw datapath

[ upstream commit 845ec48ce0640360f5f794428543d00ba5cd5c2d ]

Fix out of place scatter gather list in sym raw datapath unit test.

Fixes: cd8166c28cd1 ("test/crypto: add raw API test for dpaax")

Signed-off-by: Kai Ji <kai.ji at intel.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 app/test/test_cryptodev.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 6c949605b8..16431efc88 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -210,4 +210,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
 	struct crypto_unittest_params *ut_params = &unittest_params;
 	int is_sgl = sop->m_src->nb_segs > 1;
+	int is_oop = 0;
 
 	ctx_service_size = rte_cryptodev_get_raw_dp_ctx_size(dev_id);
@@ -248,4 +249,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
 	ofs.raw = 0;
 
+	if ((sop->m_dst != NULL) && (sop->m_dst != sop->m_src))
+		is_oop = 1;
+
 	if (is_cipher && is_auth) {
 		cipher_offset = sop->cipher.data.offset;
@@ -278,4 +282,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
 			uint32_t remaining_off = auth_offset + auth_len;
 			struct rte_mbuf *sgl_buf = sop->m_src;
+			if (is_oop)
+				sgl_buf = sop->m_dst;
 
 			while (remaining_off >= rte_pktmbuf_data_len(sgl_buf)
@@ -294,5 +300,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
 		if ((auth_offset + auth_len < cipher_offset + cipher_len) &&
 				(digest.iova == auth_end_iova) && is_sgl)
-			max_len = RTE_MAX(max_len, auth_offset + auth_len +
+			max_len = RTE_MAX(max_len,
+				auth_offset + auth_len +
 				ut_params->auth_xform.auth.digest_length);
 
@@ -357,5 +364,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
 	sgl.num = n;
 	/* Out of place */
-	if (sop->m_dst != NULL) {
+	if (is_oop) {
 		dest_sgl.vec = dest_data_vec;
 		vec.dest_sgl = &dest_sgl;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:48.563506836 +0000
+++ 0186-test-crypto-fix-out-of-place-SGL-in-raw-datapath.patch	2022-02-21 15:22:44.373704761 +0000
@@ -1 +1 @@
-From 845ec48ce0640360f5f794428543d00ba5cd5c2d Mon Sep 17 00:00:00 2001
+From 98ece68514f878ca3f59af43e2c9ead871f02d0a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 845ec48ce0640360f5f794428543d00ba5cd5c2d ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 8842e19d3d..a63c199964 100644
+index 6c949605b8..16431efc88 100644
@@ -21 +22 @@
-@@ -212,4 +212,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+@@ -210,4 +210,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
@@ -27 +28 @@
-@@ -250,4 +251,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+@@ -248,4 +249,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
@@ -35 +36 @@
-@@ -280,4 +284,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+@@ -278,4 +282,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
@@ -42 +43 @@
-@@ -296,5 +302,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+@@ -294,5 +300,6 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
@@ -50 +51 @@
-@@ -359,5 +366,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
+@@ -357,5 +364,5 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,