Commit 5e7ecc38 authored by Junxian Huang's avatar Junxian Huang Committed by Juan Zhou
Browse files

RDMA/hns: Support SW stats with debugfs 

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



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

Support SW stats with debugfs.

Query output:
$ cat /sys/kernel/debug/hns_roce/hns_0/sw_stat/sw_stat
aeqe                 --- 3341
ceqe                 --- 0
cmds                 --- 6764
cmds_err             --- 0
posted_mbx           --- 3344
polled_mbx           --- 3
mbx_event            --- 3341
qp_create_err        --- 0
qp_modify_err        --- 0
cq_create_err        --- 0
srq_create_err       --- 0
xrcd_alloc_err       --- 0
mr_reg_err           --- 0
mr_rereg_err         --- 0
ah_create_err        --- 0
mmap_err             --- 0
uctx_alloc_err       --- 0
srq_modify_err       --- 0

Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
parent 42a92460

drivers/infiniband/hw/hns/hns_roce_ah.c

+6 −2
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)

		return ret;

		goto err_out;



	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)

			return ret;

			goto err_out;



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

	}
@@ -112,6 +112,10 @@ 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

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

				     struct hns_roce_mbox_msg *mbox_msg)

{

	return hr_dev->hw->post_mbox(hr_dev, 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;

}



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

	}



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

	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;

}



static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev,
@@ -89,6 +101,7 @@ 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

+10 −7
Original line number Diff line number Diff line
@@ -464,34 +464,34 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	struct hns_roce_cq *hr_cq = to_hr_cq(ib_cq);

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_ib_create_cq ucmd = {};

	int ret;

	int ret = -EOPNOTSUPP;



	if (attr->flags)

		return -EOPNOTSUPP;

		goto err_out;



	ret = verify_cq_create_attr(hr_dev, attr);

	if (ret)

		return ret;

		goto err_out;



	if (udata) {

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

		if (ret)

			return ret;

			goto err_out;



	}



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

	if (ret)

		return ret;

		goto err_out;



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

	if (ret)

		return ret;

		goto err_out;



	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);

		return ret;

		goto err_out;

	}



	ret = alloc_cq_db(hr_dev, hr_cq, udata, ucmd.db_addr, &resp);
@@ -539,6 +539,9 @@ 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_debugfs.c

+78 −0
Original line number Diff line number Diff line
@@ -85,11 +85,17 @@ struct hns_poe_debugfs { 
	struct dentry *root; /* dev debugfs entry */

};



struct hns_sw_stat_debugfs {

	struct dentry *root;

	struct hns_debugfs_seqfile sw_stat;

};



/* Debugfs for device */

struct hns_roce_dev_debugfs {

	struct dentry *root;

	struct hns_dca_debugfs *dca_root;

	struct hns_poe_debugfs *poe_root;

	struct hns_sw_stat_debugfs *sw_stat_root;

};



struct dca_mem_stats {
@@ -634,6 +640,71 @@ void hns_roce_unregister_uctx_debugfs(struct hns_roce_dev *hr_dev, 
	}

}



static const char * const sw_stat_info[] = {

	[HNS_ROCE_DFX_AEQE_CNT] = "aeqe",

	[HNS_ROCE_DFX_CEQE_CNT] = "ceqe",

	[HNS_ROCE_DFX_CMDS_CNT] = "cmds",

	[HNS_ROCE_DFX_CMDS_ERR_CNT] = "cmds_err",

	[HNS_ROCE_DFX_MBX_POSTED_CNT] = "posted_mbx",

	[HNS_ROCE_DFX_MBX_POLLED_CNT] = "polled_mbx",

	[HNS_ROCE_DFX_MBX_EVENT_CNT] = "mbx_event",

	[HNS_ROCE_DFX_QP_CREATE_ERR_CNT] = "qp_create_err",

	[HNS_ROCE_DFX_QP_MODIFY_ERR_CNT] = "qp_modify_err",

	[HNS_ROCE_DFX_CQ_CREATE_ERR_CNT] = "cq_create_err",

	[HNS_ROCE_DFX_CQ_MODIFY_ERR_CNT] = "cq_modify_err",

	[HNS_ROCE_DFX_SRQ_CREATE_ERR_CNT] = "srq_create_err",

	[HNS_ROCE_DFX_SRQ_MODIFY_ERR_CNT] = "srq_modify_err",

	[HNS_ROCE_DFX_XRCD_ALLOC_ERR_CNT] = "xrcd_alloc_err",

	[HNS_ROCE_DFX_MR_REG_ERR_CNT] = "mr_reg_err",

	[HNS_ROCE_DFX_MR_REREG_ERR_CNT] = "mr_rereg_err",

	[HNS_ROCE_DFX_AH_CREATE_ERR_CNT] = "ah_create_err",

	[HNS_ROCE_DFX_MMAP_ERR_CNT] = "mmap_err",

	[HNS_ROCE_DFX_UCTX_ALLOC_ERR_CNT] = "uctx_alloc_err",

};



static int sw_stat_debugfs_show(struct seq_file *file, void *offset)

{

	struct hns_roce_dev *hr_dev = file->private;

	int i;



	for (i = 0; i < HNS_ROCE_DFX_CNT_TOTAL; i++)

		seq_printf(file, "%-20s --- %lld\n", sw_stat_info[i],

			   atomic64_read(&hr_dev->dfx_cnt[i]));



	return 0;

}



static struct hns_sw_stat_debugfs

	*create_sw_stat_debugfs(struct hns_roce_dev *hr_dev,

				struct dentry *parent)

{

	struct hns_sw_stat_debugfs *dbgfs;



	if (IS_ERR(parent))

		return NULL;



	dbgfs = kvzalloc(sizeof(*dbgfs), GFP_KERNEL);

	if (!dbgfs)

		return NULL;



	dbgfs->root = debugfs_create_dir("sw_stat", parent);

	if (IS_ERR_OR_NULL(dbgfs->root)) {

		kvfree(dbgfs);

		return NULL;

	}



	init_debugfs_seqfile(&dbgfs->sw_stat, "sw_stat", dbgfs->root,

			     sw_stat_debugfs_show, hr_dev);

	return dbgfs;

}



static void destroy_sw_stat_debugfs(struct hns_sw_stat_debugfs *sw_stat_dbgfs)

{

	cleanup_debugfs_seqfile(&sw_stat_dbgfs->sw_stat);

	debugfs_remove_recursive(sw_stat_dbgfs->root);

	kvfree(sw_stat_dbgfs);

}



/* debugfs for device */

void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev)

{
@@ -659,6 +730,8 @@ void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev) 
	if (poe_is_supported(hr_dev))

		dbgfs->poe_root = create_poe_debugfs(hr_dev, dbgfs->root);



	dbgfs->sw_stat_root = create_sw_stat_debugfs(hr_dev, dbgfs->root);



	hr_dev->dbgfs = dbgfs;

}
@@ -683,6 +756,11 @@ void hns_roce_unregister_debugfs(struct hns_roce_dev *hr_dev) 
		dbgfs->poe_root = NULL;

	}



	if (dbgfs->sw_stat_root) {

		destroy_sw_stat_debugfs(dbgfs->sw_stat_root);

		dbgfs->sw_stat_root = NULL;

	}



	debugfs_remove_recursive(dbgfs->root);

	hr_dev->dbgfs = NULL;

	kfree(dbgfs);

drivers/infiniband/hw/hns/hns_roce_device.h

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

};



enum hns_roce_sw_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_CQ_MODIFY_ERR_CNT,

	HNS_ROCE_DFX_SRQ_CREATE_ERR_CNT,

	HNS_ROCE_DFX_SRQ_MODIFY_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);
@@ -1153,6 +1176,7 @@ 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;