From: Gagandeep Singh <[email protected]>
dpaa2_dpdmai_dev_uninit() was called from dpaa2_qdma_close(), but
rte_dma close may run without a matching device remove, so the
uninitialization (which frees the qdma_dev allocation and the MC portal)
could run twice or leak the MC portal.
Move dpaa2_dpdmai_dev_uninit() to dpaa2_qdma_remove(), which is the
correct teardown counterpart of dpaa2_qdma_probe(). To reach the dmadev
from the remove callback, store the rte_dma_dev pointer in
struct rte_dpaa2_device at probe time and use it in remove, dropping the
now-unused forward declaration.
Fixes: 8caf8427f85a ("dma/dpaa2: introduce driver skeleton")
Cc: [email protected]
Signed-off-by: Gagandeep Singh <[email protected]>
---
drivers/bus/fslmc/bus_fslmc_driver.h | 1 +
drivers/dma/dpaa2/dpaa2_qdma.c | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/bus/fslmc/bus_fslmc_driver.h
b/drivers/bus/fslmc/bus_fslmc_driver.h
index 44f81cf662..c64ef094d0 100644
--- a/drivers/bus/fslmc/bus_fslmc_driver.h
+++ b/drivers/bus/fslmc/bus_fslmc_driver.h
@@ -102,6 +102,7 @@ struct rte_dpaa2_device {
char ep_name[RTE_DEV_NAME_MAX_LEN];
struct rte_intr_handle *intr_handle; /**< Interrupt handle */
char name[FSLMC_OBJECT_MAX_LEN]; /**< DPAA2 Object name*/
+ struct rte_dma_dev *dmadev; /**< DMA device */
};
typedef int (*rte_dpaa2_obj_create_t)(int vdev_fd,
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c
index f7d94bb799..4a95f2a1ab 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.c
+++ b/drivers/dma/dpaa2/dpaa2_qdma.c
@@ -1455,9 +1455,6 @@ dpaa2_qdma_stop(struct rte_dma_dev *dev)
return 0;
}
-static int
-dpaa2_dpdmai_dev_uninit(struct rte_dma_dev *dev);
-
static int
dpaa2_qdma_close(struct rte_dma_dev *dev)
{
@@ -1508,8 +1505,6 @@ dpaa2_qdma_close(struct rte_dma_dev *dev)
/* Reset QDMA device structure */
qdma_dev->num_vqs = 0;
- dpaa2_dpdmai_dev_uninit(dev);
-
return 0;
}
@@ -1708,6 +1703,7 @@ dpaa2_qdma_probe(struct rte_dpaa2_driver *dpaa2_drv,
return -EINVAL;
}
+ dpaa2_dev->dmadev = dmadev;
dmadev->dev_ops = &dpaa2_qdma_ops;
dmadev->device = &dpaa2_dev->device;
dmadev->fp_obj->dev_private = dmadev->data->dev_private;
@@ -1731,10 +1727,13 @@ dpaa2_qdma_probe(struct rte_dpaa2_driver *dpaa2_drv,
static int
dpaa2_qdma_remove(struct rte_dpaa2_device *dpaa2_dev)
{
+ struct rte_dma_dev *dmadev = dpaa2_dev->dmadev;
int ret;
DPAA2_QDMA_FUNC_TRACE();
+ dpaa2_dpdmai_dev_uninit(dmadev);
+
ret = rte_dma_pmd_release(dpaa2_dev->device.name);
if (ret)
DPAA2_QDMA_ERR("Device cleanup failed");
--
2.43.0
