From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 30856A0C45 for ; Thu, 10 Jun 2021 14:07:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B2034003C; Thu, 10 Jun 2021 14:07:47 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id EC63B4003C for ; Thu, 10 Jun 2021 14:07:45 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTN-00008r-O1; Thu, 10 Jun 2021 12:07:45 +0000 From: Christian Ehrhardt To: Adam Dybkowski Cc: Fan Zhang , dpdk stable Date: Thu, 10 Jun 2021 14:06:18 +0200 Message-Id: <20210610120641.885862-30-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/qat: fix null authentication request' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 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/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c19da5ea08ac775e0effc0e13f83aac6867288a5 Thanks. Christian Ehrhardt --- >From c19da5ea08ac775e0effc0e13f83aac6867288a5 Mon Sep 17 00:00:00 2001 From: Adam Dybkowski Date: Mon, 10 May 2021 11:20:11 +0100 Subject: [PATCH] crypto/qat: fix null authentication request [ 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 Acked-by: Fan Zhang --- 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 9990507187..696b231a00 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -310,8 +310,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.508568647 +0200 +++ 0030-crypto-qat-fix-null-authentication-request.patch 2021-06-10 14:04:58.058024583 +0200 @@ -1 +1 @@ -From 5cce3bd6b2fc9e272a8defc7b8971a96232d4529 Mon Sep 17 00:00:00 2001 +From c19da5ea08ac775e0effc0e13f83aac6867288a5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5cce3bd6b2fc9e272a8defc7b8971a96232d4529 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index a1f5676c04..9415ec7d32 100644 +index 9990507187..696b231a00 100644 @@ -23 +24 @@ -@@ -399,8 +399,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -310,8 +310,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,