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 85F55A0351 for ; Mon, 21 Feb 2022 16:43:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 803F8410F3; Mon, 21 Feb 2022 16:43:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 54AA14013F for ; Mon, 21 Feb 2022 16:43:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tCKdj58novKMWbHiljLIlJGJs6xJHmfz5+hgyJehMRI=; b=DgkyvAIMjN87Rj2appLNMaFkK7ZGIg6Sz8U2X1ZF+fHW+PY4qJfs1lAIgKbE8q16cuK/i3 IVu/F2XIAx6NbgTHhIMjrb7qziM6PuxL3YToIEY5BYi3E8VwkSLCVvHnImN8Q6VIxhiXxr ZmHkdFt6tE9AoJqA0Xc6PQQIi4VP/LE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-0wbEdSBNPJuyuh0ldBCZTA-1; Mon, 21 Feb 2022 10:43:21 -0500 X-MC-Unique: 0wbEdSBNPJuyuh0ldBCZTA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D5F4343C9; Mon, 21 Feb 2022 15:43:20 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 717ED7E131; Mon, 21 Feb 2022 15:43:19 +0000 (UTC) From: Kevin Traynor To: Kai Ji Cc: Fan Zhang , dpdk stable Subject: patch 'crypto/qat: fix GEN4 AEAD job in raw data path' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:18 +0000 Message-Id: <20220221153625.152324-189-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 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/6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8 Thanks. Kevin --- >From 6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8 Mon Sep 17 00:00:00 2001 From: Kai Ji Date: Fri, 21 Jan 2022 10:38:30 +0000 Subject: [PATCH] crypto/qat: fix GEN4 AEAD job in raw data path [ upstream commit 3cb8f5347735eead44945ff5dbbdaf1069475d82 ] This patch fix the cipher params configuration in AEAD job if QAT GEN4 unified cipher slice(UCS) enabled. Fixes: 328d690d2f60 ("crypto/qat: update raw data path") Signed-off-by: Kai Ji Acked-by: Fan Zhang --- drivers/crypto/qat/qat_sym_hw_dp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c index 12825e448b..792ad2b213 100644 --- a/drivers/crypto/qat/qat_sym_hw_dp.c +++ b/drivers/crypto/qat/qat_sym_hw_dp.c @@ -534,6 +534,18 @@ enqueue_one_aead_job(struct qat_sym_session *ctx, if (ctx->is_single_pass) { enqueue_one_cipher_job(ctx, req, iv, ofs, data_len); - cipher_param->spc_aad_addr = aad->iova; - cipher_param->spc_auth_res_addr = digest->iova; + + if (ctx->is_ucs) { + /* QAT GEN4 uses single pass to treat AEAD as cipher + * operation + */ + struct icp_qat_fw_la_cipher_20_req_params *cipher_param_20 = + (void *)&req->serv_specif_rqpars; + cipher_param_20->spc_aad_addr = aad->iova; + cipher_param_20->spc_auth_res_addr = digest->iova; + } else { + cipher_param->spc_aad_addr = aad->iova; + cipher_param->spc_auth_res_addr = digest->iova; + } + return; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.629185160 +0000 +++ 0189-crypto-qat-fix-GEN4-AEAD-job-in-raw-data-path.patch 2022-02-21 15:22:44.375704766 +0000 @@ -1 +1 @@ -From 3cb8f5347735eead44945ff5dbbdaf1069475d82 Mon Sep 17 00:00:00 2001 +From 6f9d8df3d1bc4abbf43ab298b4935fd499f11ab8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3cb8f5347735eead44945ff5dbbdaf1069475d82 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org