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

!15059 RDMA/hns: Fix free_mr_qp not assigning qp->device in error flow 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chengchang Tang <tangchengchang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/674DN6Z2M5MSDKZCXDCQF7MT4LTREIU4/ 
 
https://gitee.com/openeuler/kernel/issues/IBLA1C 
 
Link:https://gitee.com/openeuler/kernel/pulls/15059

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents d0165578 c11481f5

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -3055,6 +3055,8 @@ static struct hns_roce_qp *create_free_mr_qp(struct hns_roce_dev *hr_dev, 
		ibdev_err(ibdev, "failed to create qp for free mr.\n");

		return NULL;

	}

	qp->device = ibdev;

	qp->qp_type = IB_QPT_RC;



	return to_hr_qp(qp);

}
@@ -3138,8 +3140,6 @@ static int free_mr_modify_rsv_qp(struct hns_roce_dev *hr_dev, 


	hr_qp = to_hr_qp(&free_mr->rsv_qp[sl_num]->ibqp);

	hr_qp->free_mr_en = 1;

	hr_qp->ibqp.device = ibdev;

	hr_qp->ibqp.qp_type = IB_QPT_RC;



	mask = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT | IB_QP_ACCESS_FLAGS;

	attr->qp_state = IB_QPS_INIT;