Unverified Commit 66b59989 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7628 [sync] PR-5950: RDMA/qedr: Fix qedr_create_user_qp error flow 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5950 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WBPW2LODSULQC4B6DJOQWDCRKCK5CT4I/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2M7 
 
Link:https://gitee.com/openeuler/kernel/pulls/7628

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4cf0114b 0fc83220

drivers/infiniband/hw/qedr/verbs.c

+10 −1
Original line number Diff line number Diff line
@@ -1865,9 +1865,18 @@ static int qedr_create_user_qp(struct qedr_dev *dev, 
		/* RQ - read access only (0) */

		rc = qedr_init_user_queue(udata, dev, &qp->urq, ureq.rq_addr,

					  ureq.rq_len, true, 0, alloc_and_init);

		if (rc)

		if (rc) {

			ib_umem_release(qp->usq.umem);

			qp->usq.umem = NULL;

			if (rdma_protocol_roce(&dev->ibdev, 1)) {

				qedr_free_pbl(dev, &qp->usq.pbl_info,

					      qp->usq.pbl_tbl);

			} else {

				kfree(qp->usq.pbl_tbl);

			}

			return rc;

		}

	}



	memset(&in_params, 0, sizeof(in_params));

	qedr_init_common_qp_in_params(dev, pd, qp, attrs, false, &in_params);