i40iw: Fix memory leak in CQP destroy when in reset

On a device close, the control QP (CQP) is destroyed by calling
cqp_destroy which destroys the CQP and frees its SD buffer memory.
However, if the reset flag is true, cqp_destroy is never called and
leads to a memory leak on SD buffer memory. Fix this by always calling
cqp_destroy, on device close, regardless of reset. The exception to this
when CQP create fails. In this case, the SD buffer memory is already
freed on an error check and there is no need to call cqp_destroy.

Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/i40iw/i40iw_main.c b/drivers/infiniband/hw/i40iw/i40iw_main.c
index 4ce05b8e8f0a81b73874cf815f3651c5999b3e38..85d8fa63d5b5e5690d8c459681e42c55712da4b9 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_main.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_main.c
@@ -237,14 +237,11 @@ static irqreturn_t i40iw_irq_handler(int irq, void *data)
  */
 static void i40iw_destroy_cqp(struct i40iw_device *iwdev, bool free_hwcqp)
 {
-       enum i40iw_status_code status = 0;
        struct i40iw_sc_dev *dev = &iwdev->sc_dev;
        struct i40iw_cqp *cqp = &iwdev->cqp;
 
-       if (free_hwcqp && dev->cqp_ops->cqp_destroy)
-               status = dev->cqp_ops->cqp_destroy(dev->cqp);
-       if (status)
-               i40iw_pr_err("destroy cqp failed");
+       if (free_hwcqp)
+               dev->cqp_ops->cqp_destroy(dev->cqp);
 
        i40iw_free_dma_mem(dev->hw, &cqp->sq);
        kfree(cqp->scratch_array);
@@ -1475,7 +1472,7 @@ static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset)
                i40iw_del_hmc_objects(dev, dev->hmc_info, true, reset);
                /* fallthrough */
        case CQP_CREATED:
-               i40iw_destroy_cqp(iwdev, !reset);
+               i40iw_destroy_cqp(iwdev, true);
                /* fallthrough */
        case INITIAL_STATE:
                i40iw_cleanup_cm_core(&iwdev->cm_core);