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 11A22A0A02 for ; Mon, 17 May 2021 18:14:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B4BE40041; Mon, 17 May 2021 18:14:52 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 559DC40041 for ; Mon, 17 May 2021 18:14:50 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liftK-00086H-4C; Mon, 17 May 2021 16:14:50 +0000 From: Christian Ehrhardt To: Arek Kusztal Cc: Declan Doherty , dpdk stable Date: Mon, 17 May 2021 18:08:56 +0200 Message-Id: <20210517161039.3132619-107-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/qat: fix offset for out-of-place scatter-gather' 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 05/19/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/33a72320c478a23ee9b132cd9b53060f024c4cd8 Thanks. Christian Ehrhardt --- >From 33a72320c478a23ee9b132cd9b53060f024c4cd8 Mon Sep 17 00:00:00 2001 From: Arek Kusztal Date: Thu, 18 Mar 2021 13:16:17 +0000 Subject: [PATCH] crypto/qat: fix offset for out-of-place scatter-gather [ 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 Acked-by: Declan Doherty --- 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 fda20ad26d..9990507187 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -161,6 +161,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; @@ -447,6 +448,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 @@ -507,7 +509,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.629763675 +0200 +++ 0107-crypto-qat-fix-offset-for-out-of-place-scatter-gathe.patch 2021-05-17 17:40:29.311810579 +0200 @@ -1 +1 @@ -From 935da450b414610a3aa2855fb9bb0c6f105e59ba Mon Sep 17 00:00:00 2001 +From 33a72320c478a23ee9b132cd9b53060f024c4cd8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 935da450b414610a3aa2855fb9bb0c6f105e59ba ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2c0f5cd925..a1f5676c04 100644 +index fda20ad26d..9990507187 100644 @@ -23 +24 @@ -@@ -228,6 +228,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -161,6 +161,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, @@ -31 +32 @@ -@@ -538,6 +539,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -447,6 +448,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, @@ -39 +40 @@ -@@ -598,7 +600,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -507,7 +509,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,