crypto/dpaa2_sec: fix fle buffer leak

Driver allocates a fle buffer for each packet
before enqueue and free the buffer on dequeue. But in case if
there are enqueue failures, then code should free the fle buffers.

Fixes: 4562de326d30 ("crypto/dpaa2_sec: support ordered queue")
Fixes: 3ffce51a1f04 ("crypto/dpaa2_sec: add enqueue retry timeout")
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/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index e62d04852b21645760f2ce8d7a0421f305b87626..03fef5e500c62d553fc9cb2a4583b1343d2c5a36 100644 (file)
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016-2021 NXP
+ *   Copyright 2016-2022 NXP
  *
  */
 
@@ -64,6 +64,27 @@ enum dpaa2_sec_dump_levels {
 uint8_t cryptodev_driver_id;
 uint8_t dpaa2_sec_dp_dump = DPAA2_SEC_DP_ERR_DUMP;
 
+static inline void
+free_fle(const struct qbman_fd *fd)
+{
+       struct qbman_fle *fle;
+       struct rte_crypto_op *op;
+       struct ctxt_priv *priv;
+
+#ifdef RTE_LIB_SECURITY
+       if (DPAA2_FD_GET_FORMAT(fd) == qbman_fd_single)
+               return;
+#endif
+       fle = (struct qbman_fle *)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd));
+       op = (struct rte_crypto_op *)DPAA2_GET_FLE_ADDR((fle - 1));
+       /* free the fle memory */
+       if (likely(rte_pktmbuf_is_contiguous(op->sym->m_src))) {
+               priv = (struct ctxt_priv *)(size_t)DPAA2_GET_FLE_CTXT(fle - 1);
+               rte_mempool_put(priv->fle_pool, (void *)(fle-1));
+       } else
+               rte_free((void *)(fle-1));
+}
+
 #ifdef RTE_LIB_SECURITY
 static inline int
 build_proto_compound_sg_fd(dpaa2_sec_session *sess,
@@ -1513,6 +1534,12 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                                if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) {
                                        num_tx += loop;
                                        nb_ops -= loop;
+                                       DPAA2_SEC_DP_DEBUG("Enqueue fail\n");
+                                       /* freeing the fle buffers */
+                                       while (loop < frames_to_send) {
+                                               free_fle(&fd_arr[loop]);
+                                               loop++;
+                                       }
                                        goto skip_tx;
                                }
                        } else {
@@ -1854,6 +1881,12 @@ dpaa2_sec_enqueue_burst_ordered(void *qp, struct rte_crypto_op **ops,
                                if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) {
                                        num_tx += loop;
                                        nb_ops -= loop;
+                                       DPAA2_SEC_DP_DEBUG("Enqueue fail\n");
+                                       /* freeing the fle buffers */
+                                       while (loop < frames_to_send) {
+                                               free_fle(&fd_arr[loop]);
+                                               loop++;
+                                       }
                                        goto skip_tx;
                                }
                        } else {