[dpdk-stable] patch 'crypto/qat: fix offset for out-of-place scatter-gather' 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 05/12/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/acbb986965b95c99b805836b2f2ec0faf20576f4

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From acbb986965b95c99b805836b2f2ec0faf20576f4 Mon Sep 17 00:00:00 2001
From: Arek Kusztal <arkadiuszx.kusztal at intel.com>
Date: Thu, 18 Mar 2021 13:16:17 +0000
Subject: [PATCH] crypto/qat: fix offset for out-of-place scatter-gather
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 935da450b414610a3aa2855fb9bb0c6f105e59ba ]

This commit fixes problem with to small offset when both offsets
(auth, cipher) are non zero in digest encrypt case,
when using out-of-place and sgl.

Fixes: 40002f6c2a24 ("crypto/qat: extend support for digest-encrypted auth-cipher")

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal at intel.com>
Acked-by: Declan Doherty <declan.doherty at intel.com>
---
 drivers/crypto/qat/qat_sym.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 4b7676deb8..a6cd33be37 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -162,6 +162,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 	uint8_t do_sgl = 0;
 	uint8_t in_place = 1;
 	int alignment_adjustment = 0;
+	int oop_shift = 0;
 	struct rte_crypto_op *op = (struct rte_crypto_op *)in_op;
 	struct qat_sym_op_cookie *cookie =
 				(struct qat_sym_op_cookie *)op_cookie;
@@ -472,6 +473,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 			rte_pktmbuf_iova_offset(op->sym->m_src, min_ofs);
 		dst_buf_start =
 			rte_pktmbuf_iova_offset(op->sym->m_dst, min_ofs);
+		oop_shift = min_ofs;
 
 	} else {
 		/* In-place operation
@@ -532,7 +534,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 		 /* First find the end of the data */
 		if (do_sgl) {
 			uint32_t remaining_off = auth_param->auth_off +
-				auth_param->auth_len + alignment_adjustment;
+				auth_param->auth_len + alignment_adjustment + oop_shift;
 			struct rte_mbuf *sgl_buf =
 				(in_place ?
 					op->sym->m_src : op->sym->m_dst);
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:31.117792300 +0800
+++ 0176-crypto-qat-fix-offset-for-out-of-place-scatter-gathe.patch	2021-05-10 23:59:26.610000000 +0800
@@ -1 +1 @@
-From 935da450b414610a3aa2855fb9bb0c6f105e59ba Mon Sep 17 00:00:00 2001
+From acbb986965b95c99b805836b2f2ec0faf20576f4 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 935da450b414610a3aa2855fb9bb0c6f105e59ba ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 2c0f5cd925..a1f5676c04 100644
+index 4b7676deb8..a6cd33be37 100644
@@ -23 +25 @@
-@@ -228,6 +228,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
+@@ -162,6 +162,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
@@ -31 +33 @@
-@@ -538,6 +539,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
+@@ -472,6 +473,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
@@ -39 +41 @@
-@@ -598,7 +600,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
+@@ -532,7 +534,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,