Commit f7a2259b authored by Juan Zhou's avatar Juan Zhou
Browse files

Revert "RDMA/hns: Add dfx cnt stats" 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8EX1J



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

This reverts commit d5a4ca75.

Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent 57063438

drivers/infiniband/hw/hns/hns_roce_ah.c

+2 −6
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
		ret = 0;



	if (ret && grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)

		goto err_out;

		return ret;



	if (tc_mode == HNAE3_TC_MAP_MODE_DSCP &&

	    grh->sgid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
@@ -100,7 +100,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
		ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,

					      &ah->av.vlan_id, NULL);

		if (ret)

			goto err_out;

			return ret;



		ah->av.vlan_en = ah->av.vlan_id < VLAN_N_VID;

	}
@@ -112,10 +112,6 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
				       min(udata->outlen, sizeof(resp)));

	}



err_out:

	if (ret)

		atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_AH_CREATE_ERR_CNT]);



	return ret;

}

drivers/infiniband/hw/hns/hns_roce_cmd.c

+2 −15
Original line number Diff line number Diff line
@@ -41,14 +41,7 @@ 
static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev,

				     struct hns_roce_mbox_msg *mbox_msg)

{

	int ret;



	ret = hr_dev->hw->post_mbox(hr_dev, mbox_msg);

	if (ret)

		return ret;



	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_POSTED_CNT]);

	return 0;

	return hr_dev->hw->post_mbox(hr_dev, mbox_msg);

}



/* this should be called with "poll_sem" */
@@ -65,12 +58,7 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, 
		return ret;

	}



	ret = hr_dev->hw->poll_mbox_done(hr_dev);

	if (ret)

		return ret;



	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_POLLED_CNT]);

	return 0;

	return hr_dev->hw->poll_mbox_done(hr_dev);

}



static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev,
@@ -101,7 +89,6 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, 
	context->result = (status == HNS_ROCE_CMD_SUCCESS) ? 0 : (-EIO);

	context->out_param = out_param;

	complete(&context->done);

	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_MBX_EVENT_CNT]);

}



static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_cq.c

+7 −12
Original line number Diff line number Diff line
@@ -466,34 +466,32 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	struct hns_roce_ib_create_cq ucmd = {};

	int ret;



	if (attr->flags) {

		ret = -EOPNOTSUPP;

		goto err_out;

	}

	if (attr->flags)

		return -EOPNOTSUPP;



	ret = verify_cq_create_attr(hr_dev, attr);

	if (ret)

		goto err_out;

		return ret;



	if (udata) {

		ret = get_cq_ucmd(hr_cq, udata, &ucmd);

		if (ret)

			goto err_out;

			return ret;



	}



	ret = set_cq_param(hr_cq, attr->cqe, attr->comp_vector, &ucmd);

	if (ret)

		goto err_out;

		return ret;



	ret = set_cqe_size(hr_cq, udata, &ucmd);

	if (ret)

		goto err_out;

		return ret;



	ret = alloc_cq_buf(hr_dev, hr_cq, udata, ucmd.buf_addr);

	if (ret) {

		ibdev_err(ibdev, "failed to alloc CQ buf, ret = %d.\n", ret);

		goto err_out;

		return ret;

	}



	ret = alloc_cq_db(hr_dev, hr_cq, udata, ucmd.db_addr, &resp);
@@ -541,9 +539,6 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	free_cq_db(hr_dev, hr_cq, udata);

err_cq_buf:

	free_cq_buf(hr_dev, hr_cq);

err_out:

	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_CQ_CREATE_ERR_CNT]);



	return ret;

}

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −22
Original line number Diff line number Diff line
@@ -994,27 +994,6 @@ enum hns_roce_hw_pkt_stat_index { 
	HNS_ROCE_HW_CNT_TOTAL,

};



enum hns_roce_hw_dfx_stat_index {

	HNS_ROCE_DFX_AEQE_CNT,

	HNS_ROCE_DFX_CEQE_CNT,

	HNS_ROCE_DFX_CMDS_CNT,

	HNS_ROCE_DFX_CMDS_ERR_CNT,

	HNS_ROCE_DFX_MBX_POSTED_CNT,

	HNS_ROCE_DFX_MBX_POLLED_CNT,

	HNS_ROCE_DFX_MBX_EVENT_CNT,

	HNS_ROCE_DFX_QP_CREATE_ERR_CNT,

	HNS_ROCE_DFX_QP_MODIFY_ERR_CNT,

	HNS_ROCE_DFX_CQ_CREATE_ERR_CNT,

	HNS_ROCE_DFX_SRQ_CREATE_ERR_CNT,

	HNS_ROCE_DFX_XRCD_ALLOC_ERR_CNT,

	HNS_ROCE_DFX_MR_REG_ERR_CNT,

	HNS_ROCE_DFX_MR_REREG_ERR_CNT,

	HNS_ROCE_DFX_AH_CREATE_ERR_CNT,

	HNS_ROCE_DFX_MMAP_ERR_CNT,

	HNS_ROCE_DFX_UCTX_ALLOC_ERR_CNT,

	HNS_ROCE_DFX_CNT_TOTAL

};



struct hns_roce_hw {

	int (*cmq_init)(struct hns_roce_dev *hr_dev);

	void (*cmq_exit)(struct hns_roce_dev *hr_dev);
@@ -1174,7 +1153,6 @@ struct hns_roce_dev { 


	struct notifier_block bond_nb;

	struct hns_roce_port port_data[HNS_ROCE_MAX_PORTS];

	atomic64_t *dfx_cnt;

	struct hns_roce_poe_ctx poe_ctx; /* poe ch array */



	struct rdma_notify_mem *notify_tbl;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −7
Original line number Diff line number Diff line
@@ -1416,8 +1416,6 @@ static int __hns_roce_cmq_send(struct hns_roce_dev *hr_dev, 
	/* Write to hardware */

	roce_write(hr_dev, ROCEE_TX_CMQ_PI_REG, csq->head);



	atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_CMDS_CNT]);



	do {

		if (hns_roce_cmq_csq_done(hr_dev))

			break;
@@ -1457,9 +1455,6 @@ static int __hns_roce_cmq_send(struct hns_roce_dev *hr_dev, 


	spin_unlock_bh(&csq->lock);



	if (ret)

		atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_CMDS_ERR_CNT]);



	return ret;

}
@@ -6532,7 +6527,6 @@ static irqreturn_t hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev, 
		eq->sub_type = sub_type;

		++eq->cons_index;

		aeqe_found = IRQ_HANDLED;

		atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_AEQE_CNT]);



		hns_roce_v2_init_irq_work(hr_dev, eq, queue_num);
@@ -6575,7 +6569,6 @@ static irqreturn_t hns_roce_v2_ceq_int(struct hns_roce_dev *hr_dev, 


		++eq->cons_index;

		ceqe_found = IRQ_HANDLED;

		atomic64_inc(&hr_dev->dfx_cnt[HNS_ROCE_DFX_CEQE_CNT]);



		ceqe = next_ceqe_sw_v2(eq);

	}