Commit 696f55e1 authored by Zhaojiahui's avatar Zhaojiahui
Browse files

Revert "RDMA/hns: Fix cpu stuck caused by printings during reset" 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB8L75


CVE: NA

----------------------------------------------------------------------

This reverts commit 80a0ecef.

Fixes: 80a0ecef ("RDMA/hns: Fix cpu stuck caused by printings during reset")
Signed-off-by: default avatarZhaojiahui <zhaojiahui12@h-partners.com>
parent 80a0ecef

drivers/infiniband/hw/hns/hns_roce_cq.c

+5 −2
Original line number Diff line number Diff line
@@ -233,9 +233,12 @@ static void free_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 


	ret = hns_roce_destroy_hw_ctx(hr_dev, HNS_ROCE_CMD_DESTROY_CQC,

				      hr_cq->cqn);

	if (ret)

		dev_err_ratelimited(dev, "DESTROY_CQ failed (%d) for CQN %06lx\n",

	if (ret) {

		hr_cq->delayed_destroy_flag = true;

		dev_err_ratelimited(dev,

				    "DESTROY_CQ failed (%d) for CQN %06lx\n",

				    ret, hr_cq->cqn);

	}



	xa_erase_irq(&cq_table->array, hr_cq->cqn);

drivers/infiniband/hw/hns/hns_roce_hem.c

+3 −2
Original line number Diff line number Diff line
@@ -713,7 +713,8 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev, 


	ret = hr_dev->hw->clear_hem(hr_dev, table, obj, HEM_HOP_STEP_DIRECT);

	if (ret)

		dev_warn_ratelimited(dev, "failed to clear HEM base address, ret = %d.\n",

		dev_warn_ratelimited(dev,

			"failed to clear HEM base address, ret = %d.\n",

			ret);



	hns_roce_free_hem(hr_dev, table->hem[i]);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+35 −22
Original line number Diff line number Diff line
@@ -451,10 +451,17 @@ static int check_send_valid(struct hns_roce_dev *hr_dev, 


	if (unlikely(hr_qp->state == IB_QPS_RESET ||

		     hr_qp->state == IB_QPS_INIT ||

		     hr_qp->state == IB_QPS_RTR))

		     hr_qp->state == IB_QPS_RTR)) {

		ibdev_err_ratelimited(ibdev,

				      "failed to post WQE, QP state %u!\n",

				      hr_qp->state);

		return -EINVAL;

	else if (unlikely(hr_dev->state >= HNS_ROCE_DEVICE_STATE_RST_DOWN))

	} else if (unlikely(hr_dev->state >= HNS_ROCE_DEVICE_STATE_RST_DOWN)) {

		ibdev_err_ratelimited(ibdev,

				      "failed to post WQE, dev state %d!\n",

				      hr_dev->state);

		return -EIO;

	}



	if (check_dca_attach_enable(hr_qp)) {

		ret = dca_attach_qp_buf(hr_dev, hr_qp);
@@ -3151,7 +3158,7 @@ static int free_mr_modify_rsv_qp(struct hns_roce_dev *hr_dev, 
	ret = hr_dev->hw->modify_qp(&hr_qp->ibqp, attr, mask, IB_QPS_INIT,

				    IB_QPS_INIT, NULL);

	if (ret) {

		ibdev_err_ratelimited(ibdev, "failed to modify qp to init, ret = %d.\n",

		ibdev_err(ibdev, "failed to modify qp to init, ret = %d.\n",

			  ret);

		return ret;

	}
@@ -3841,7 +3848,8 @@ static int free_mr_post_send_lp_wqe(struct hns_roce_qp *hr_qp) 


	ret = hns_roce_v2_post_send(&hr_qp->ibqp, send_wr, &bad_wr);

	if (ret) {

		ibdev_err_ratelimited(ibdev, "failed to post wqe for free mr, ret = %d.\n",

		ibdev_err_ratelimited(ibdev,

			"failed to post wqe for free mr, ret = %d.\n",

			ret);

		return ret;

	}
@@ -5675,8 +5683,11 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp, 
	struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);

	int ret = 0;



	if (!check_qp_state(cur_state, new_state))

	if (!check_qp_state(cur_state, new_state)) {

		ibdev_err_ratelimited(&hr_dev->ib_dev,

				      "Illegal state for QP!\n");

		return -EINVAL;

	}



	if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) {

		memset(qpc_mask, 0, hr_dev->caps.qpc_sz);
@@ -6256,11 +6267,13 @@ int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, 
		/* Modify qp to reset before destroying qp */

		ret = hns_roce_v2_modify_qp(&hr_qp->ibqp, NULL, 0,

					    hr_qp->state, IB_QPS_RESET, udata);

		if (ret)

		if (ret) {

			hr_qp->delayed_destroy_flag = true;

			ibdev_err_ratelimited(ibdev,

				  "failed to modify QP to RST, ret = %d.\n",

				  ret);

		}

	}



	send_cq = hr_qp->ibqp.send_cq ? to_hr_cq(hr_qp->ibqp.send_cq) : NULL;

	recv_cq = hr_qp->ibqp.recv_cq ? to_hr_cq(hr_qp->ibqp.recv_cq) : NULL;

drivers/infiniband/hw/hns/hns_roce_mr.c

+4 −2
Original line number Diff line number Diff line
@@ -152,10 +152,12 @@ static void hns_roce_mr_free(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr 
		ret = hns_roce_destroy_hw_ctx(hr_dev, HNS_ROCE_CMD_DESTROY_MPT,

					      key_to_hw_index(mr->key) &

					      (hr_dev->caps.num_mtpts - 1));

		if (ret)

		if (ret) {

			mr->delayed_destroy_flag = true;

			ibdev_warn_ratelimited(ibdev, "failed to destroy mpt, ret = %d.\n",

				   ret);

		}

	}



	free_mr_pbl(hr_dev, mr);

	free_mr_key(hr_dev, mr);

drivers/infiniband/hw/hns/hns_roce_srq.c

+5 −2
Original line number Diff line number Diff line
@@ -161,9 +161,12 @@ static void free_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq) 


	ret = hns_roce_destroy_hw_ctx(hr_dev, HNS_ROCE_CMD_DESTROY_SRQ,

				      srq->srqn);

	if (ret)

		dev_err_ratelimited(hr_dev->dev, "DESTROY_SRQ failed (%d) for SRQN %06lx\n",

	if (ret) {

		srq->delayed_destroy_flag = true;

		dev_err_ratelimited(hr_dev->dev,

				    "DESTROY_SRQ failed (%d) for SRQN %06lx\n",

				    ret, srq->srqn);

	}



	xa_erase_irq(&srq_table->xa, srq->srqn);