crypto/dpaa_sec: fix chained FD length in raw datapath

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")
Cc: stable@dpdk.org
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
index 522685f8cf22b1d297b57bb678bbc65fce862355..29f4e6d40b14859f7485b791769a385fbaf4f840 100644 (file)
--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2021 NXP
+ * Copyright 2021-2022 NXP
  */
 
 #include <rte_byteorder.h>
@@ -397,8 +397,8 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
        unsigned int i;
        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;
 
        for (i = 0; i < sgl->num; i++)
@@ -406,6 +406,8 @@ 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) {
                DPAA_SEC_DP_ERR("Cipher-Auth: Max sec segs supported is %d",
@@ -448,6 +450,7 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
                        qm_sg_entry_set64(sg, dest_sgl->vec[i].iova);
                        sg->length = dest_sgl->vec[i].len;
                }
+               sg->length -= ofs.ofs.cipher.tail;
        } else {
                qm_sg_entry_set64(sg, sgl->vec[0].iova);
                sg->length = sgl->vec[0].len - ofs.ofs.cipher.head;
@@ -460,6 +463,7 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
                        qm_sg_entry_set64(sg, sgl->vec[i].iova);
                        sg->length = sgl->vec[i].len;
                }
+               sg->length -= ofs.ofs.cipher.tail;
        }
 
        if (is_encode(ses)) {