Commit 6b227bd3 authored by Sindhu-Devale's avatar Sindhu-Devale Committed by Leon Romanovsky
Browse files

RDMA/irdma: Return error on MR deregister CQP failure 



The MR deregister CQP can fail if an MW is bound to it.
Return an appropriate error for this case.

Fixes: b48c24c2 ("RDMA/irdma: Implement device supported verb APIs")
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/20220906223244.1119-3-shiraz.saleem@intel.com


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

drivers/infiniband/hw/irdma/utils.c

+8 −5
Original line number Diff line number Diff line
@@ -590,14 +590,17 @@ static int irdma_wait_event(struct irdma_pci_f *rf, 
	cqp_error = cqp_request->compl_info.error;

	if (cqp_error) {

		err_code = -EIO;

		if (cqp_request->compl_info.maj_err_code == 0xFFFF &&

		    cqp_request->compl_info.min_err_code == 0x8029) {

		if (cqp_request->compl_info.maj_err_code == 0xFFFF) {

			if (cqp_request->compl_info.min_err_code == 0x8002)

				err_code = -EBUSY;

			else if (cqp_request->compl_info.min_err_code == 0x8029) {

				if (!rf->reset) {

					rf->reset = true;

					rf->gen_ops.request_reset(rf);

				}

			}

		}

	}



	return err_code;

}

drivers/infiniband/hw/irdma/verbs.c

+5 −1
Original line number Diff line number Diff line
@@ -3009,6 +3009,7 @@ static int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) 
	struct irdma_pble_alloc *palloc = &iwpbl->pble_alloc;

	struct irdma_cqp_request *cqp_request;

	struct cqp_cmds_info *cqp_info;

	int status;



	if (iwmr->type != IRDMA_MEMREG_TYPE_MEM) {

		if (iwmr->region) {
@@ -3039,8 +3040,11 @@ static int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) 
	cqp_info->post_sq = 1;

	cqp_info->in.u.dealloc_stag.dev = &iwdev->rf->sc_dev;

	cqp_info->in.u.dealloc_stag.scratch = (uintptr_t)cqp_request;

	irdma_handle_cqp_op(iwdev->rf, cqp_request);

	status = irdma_handle_cqp_op(iwdev->rf, cqp_request);

	irdma_put_cqp_request(&iwdev->rf->cqp, cqp_request);

	if (status)

		return status;



	irdma_free_stag(iwdev, iwmr->stag);

done:

	if (iwpbl->pbl_allocated)