Commit 133b1cba authored by Sindhu Devale's avatar Sindhu Devale Committed by Leon Romanovsky
Browse files

RDMA/irdma: Refactor error handling in create CQP 



In case of a failure in irdma_create_cqp, do not call
irdma_destroy_cqp, but cleanup all the allocated resources
in reverse order.

Drop the extra argument in irdma_destroy_cqp as its no longer needed.

Signed-off-by: default avatarKrzysztof Czurylo <krzysztof.czurylo@intel.com>
Signed-off-by: default avatarSindhu Devale <sindhu.devale@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Link: https://lore.kernel.org/r/20230725155505.1069-3-shiraz.saleem@intel.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 8cfc99da

drivers/infiniband/hw/irdma/hw.c

+21 −14
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void irdma_destroy_irq(struct irdma_pci_f *rf, 
 * Issue destroy cqp request and

 * free the resources associated with the cqp

 */

static void irdma_destroy_cqp(struct irdma_pci_f *rf, bool free_hwcqp)

static void irdma_destroy_cqp(struct irdma_pci_f *rf)

{

	struct irdma_sc_dev *dev = &rf->sc_dev;

	struct irdma_cqp *cqp = &rf->cqp;
@@ -575,7 +575,7 @@ static void irdma_destroy_cqp(struct irdma_pci_f *rf, bool free_hwcqp) 


	if (rf->cqp_cmpl_wq)

		destroy_workqueue(rf->cqp_cmpl_wq);

	if (free_hwcqp)



	status = irdma_sc_cqp_destroy(dev->cqp);

	if (status)

		ibdev_dbg(to_ibdev(dev), "ERR: Destroy CQP failed %d\n", status);
@@ -920,8 +920,8 @@ static int irdma_create_cqp(struct irdma_pci_f *rf) 


	cqp->scratch_array = kcalloc(sqsize, sizeof(*cqp->scratch_array), GFP_KERNEL);

	if (!cqp->scratch_array) {

		kfree(cqp->cqp_requests);

		return -ENOMEM;

		status = -ENOMEM;

		goto err_scratch;

	}



	dev->cqp = &cqp->sc_cqp;
@@ -931,15 +931,14 @@ static int irdma_create_cqp(struct irdma_pci_f *rf) 
	cqp->sq.va = dma_alloc_coherent(dev->hw->device, cqp->sq.size,

					&cqp->sq.pa, GFP_KERNEL);

	if (!cqp->sq.va) {

		kfree(cqp->scratch_array);

		kfree(cqp->cqp_requests);

		return -ENOMEM;

		status = -ENOMEM;

		goto err_sq;

	}



	status = irdma_obj_aligned_mem(rf, &mem, sizeof(struct irdma_cqp_ctx),

				       IRDMA_HOST_CTX_ALIGNMENT_M);

	if (status)

		goto exit;

		goto err_ctx;



	dev->cqp->host_ctx_pa = mem.pa;

	dev->cqp->host_ctx = mem.va;
@@ -965,7 +964,7 @@ static int irdma_create_cqp(struct irdma_pci_f *rf) 
	status = irdma_sc_cqp_init(dev->cqp, &cqp_init_info);

	if (status) {

		ibdev_dbg(to_ibdev(dev), "ERR: cqp init status %d\n", status);

		goto exit;

		goto err_ctx;

	}



	spin_lock_init(&cqp->req_lock);
@@ -976,7 +975,7 @@ static int irdma_create_cqp(struct irdma_pci_f *rf) 
		ibdev_dbg(to_ibdev(dev),

			  "ERR: cqp create failed - status %d maj_err %d min_err %d\n",

			  status, maj_err, min_err);

		goto exit;

		goto err_ctx;

	}



	INIT_LIST_HEAD(&cqp->cqp_avail_reqs);
@@ -990,8 +989,16 @@ static int irdma_create_cqp(struct irdma_pci_f *rf) 
	init_waitqueue_head(&cqp->remove_wq);

	return 0;



exit:

	irdma_destroy_cqp(rf, false);

err_ctx:

	dma_free_coherent(dev->hw->device, cqp->sq.size,

			  cqp->sq.va, cqp->sq.pa);

	cqp->sq.va = NULL;

err_sq:

	kfree(cqp->scratch_array);

	cqp->scratch_array = NULL;

err_scratch:

	kfree(cqp->cqp_requests);

	cqp->cqp_requests = NULL;



	return status;

}
@@ -1746,7 +1753,7 @@ void irdma_ctrl_deinit_hw(struct irdma_pci_f *rf) 
				      rf->reset, rf->rdma_ver);

		fallthrough;

	case CQP_CREATED:

		irdma_destroy_cqp(rf, true);

		irdma_destroy_cqp(rf);

		fallthrough;

	case INITIAL_STATE:

		irdma_del_init_mem(rf);