[dpdk-stable] patch 'crypto/qat: fix null authentication request' 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/cfd635034c73b364ec063a9e646335cb76d2b721

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From cfd635034c73b364ec063a9e646335cb76d2b721 Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski at intel.com>
Date: Mon, 10 May 2021 11:20:11 +0100
Subject: [PATCH] crypto/qat: fix null authentication request
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 5cce3bd6b2fc9e272a8defc7b8971a96232d4529 ]

This patch fixes the NULL auth generation case where the request
shouldn't contain the authentication result address. Allows to run
ipsec_autotest with a QAT device.

Fixes: 65beb9abca6d ("crypto/qat: fix null auth when using VFIO")

Signed-off-by: Adam Dybkowski <adamx.dybkowski at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
---
 drivers/crypto/qat/qat_sym.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index a6cd33be37..299605eb30 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -333,8 +333,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 		}
 		min_ofs = auth_ofs;
 
-		auth_param->auth_res_addr =
-			op->sym->auth.digest.phys_addr;
+		if (ctx->qat_hash_alg != ICP_QAT_HW_AUTH_ALGO_NULL ||
+				ctx->auth_op == ICP_QAT_HW_AUTH_VERIFY)
+			auth_param->auth_res_addr =
+					op->sym->auth.digest.phys_addr;
 
 	}
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:54:00.271178100 +0800
+++ 0145-crypto-qat-fix-null-authentication-request.patch	2021-06-12 06:53:56.600000000 +0800
@@ -1 +1 @@
-From 5cce3bd6b2fc9e272a8defc7b8971a96232d4529 Mon Sep 17 00:00:00 2001
+From cfd635034c73b364ec063a9e646335cb76d2b721 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 5cce3bd6b2fc9e272a8defc7b8971a96232d4529 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index a1f5676c04..9415ec7d32 100644
+index a6cd33be37..299605eb30 100644
@@ -23 +25 @@
-@@ -399,8 +399,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
+@@ -333,8 +333,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,