patch 'crypto/dpaa_sec: fix chained FD length in raw datapath' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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/15/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/bee2c296c83b630a1d1bd809c232bc8e78f7f945

Thanks.

Kevin

---
>From bee2c296c83b630a1d1bd809c232bc8e78f7f945 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Thu, 28 Apr 2022 17:17:22 +0530
Subject: [PATCH] crypto/dpaa_sec: fix chained FD length in raw datapath

[ upstream commit b5e761fc6be268f3894ca0bba1030fc53c2b3183 ]

DPAA sec raw driver is calculating the wrong lengths while
creating the FD for chain.
This patch fixes lengths for chain FD.

Fixes: 78156d38e112 ("crypto/dpaa_sec: support authonly and chain with raw API")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
index 522685f8cf..29f4e6d40b 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2021 NXP
+ * Copyright 2021-2022 NXP
  */
 
@@ -398,6 +398,6 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
 	uint16_t auth_hdr_len = ofs.ofs.cipher.head -
 				ofs.ofs.auth.head;
-	uint16_t auth_tail_len = ofs.ofs.auth.tail;
-	uint32_t auth_only_len = (auth_tail_len << 16) | auth_hdr_len;
+	uint16_t auth_tail_len;
+	uint32_t auth_only_len;
 	int data_len = 0, auth_len = 0, cipher_len = 0;
 
@@ -407,4 +407,6 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
 	cipher_len = data_len - ofs.ofs.cipher.head - ofs.ofs.cipher.tail;
 	auth_len = data_len - ofs.ofs.auth.head - ofs.ofs.auth.tail;
+	auth_tail_len = auth_len - cipher_len - auth_hdr_len;
+	auth_only_len = (auth_tail_len << 16) | auth_hdr_len;
 
 	if (sgl->num > MAX_SG_ENTRIES) {
@@ -449,4 +451,5 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
 			sg->length = dest_sgl->vec[i].len;
 		}
+		sg->length -= ofs.ofs.cipher.tail;
 	} else {
 		qm_sg_entry_set64(sg, sgl->vec[0].iova);
@@ -461,4 +464,5 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
 			sg->length = sgl->vec[i].len;
 		}
+		sg->length -= ofs.ofs.cipher.tail;
 	}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-10 13:24:22.296961238 +0100
+++ 0027-crypto-dpaa_sec-fix-chained-FD-length-in-raw-datapat.patch	2022-05-10 13:24:21.620646382 +0100
@@ -1 +1 @@
-From b5e761fc6be268f3894ca0bba1030fc53c2b3183 Mon Sep 17 00:00:00 2001
+From bee2c296c83b630a1d1bd809c232bc8e78f7f945 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b5e761fc6be268f3894ca0bba1030fc53c2b3183 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org