Commit 95b19586 authored by Guangbin Huang's avatar Guangbin Huang Committed by David S. Miller
Browse files

net: hns3: refactor dump qos buf cfg of debugfs 



Currently, user gets qos buffer config by implementing debugfs command
"echo dump qos buf cfg > cmd", this command will dump info in dmesg.
It's unnecessary and heavy.

To optimize it, create a single file "qos_buf_cfg" in tm directory
and use cat command to get info. It will return info to userspace,
rather than record in dmesg.

The display style is below:
$ cat qos_buf_cfg
tx_packet_buf_tc_0: 0x120
tx_packet_buf_tc_1: 0x120
tx_packet_buf_tc_2: 0x120
tx_packet_buf_tc_3: 0x120
tx_packet_buf_tc_4: 0x0
tx_packet_buf_tc_5: 0x0
tx_packet_buf_tc_6: 0x0
tx_packet_buf_tc_7: 0x0
......

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28d3bada

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,7 @@ enum hnae3_dbg_cmd { 
	HNAE3_DBG_CMD_TC_SCH_INFO,

	HNAE3_DBG_CMD_TC_SCH_INFO,

	HNAE3_DBG_CMD_QOS_PAUSE_CFG,

	HNAE3_DBG_CMD_QOS_PAUSE_CFG,

	HNAE3_DBG_CMD_QOS_PRI_MAP,

	HNAE3_DBG_CMD_QOS_PRI_MAP,

	HNAE3_DBG_CMD_QOS_BUF_CFG,

	HNAE3_DBG_CMD_DEV_INFO,

	HNAE3_DBG_CMD_DEV_INFO,

	HNAE3_DBG_CMD_TX_BD,

	HNAE3_DBG_CMD_TX_BD,

	HNAE3_DBG_CMD_RX_BD,

	HNAE3_DBG_CMD_RX_BD,

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -106,6 +106,13 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.buf_len = HNS3_DBG_READ_LEN,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

		.init = hns3_dbg_common_file_init,

	},

	},

	{

		.name = "qos_buf_cfg",

		.cmd = HNAE3_DBG_CMD_QOS_BUF_CFG,

		.dentry = HNS3_DBG_DENTRY_TM,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

	{

	{

		.name = "dev_info",

		.name = "dev_info",

		.cmd = HNAE3_DBG_CMD_DEV_INFO,

		.cmd = HNAE3_DBG_CMD_DEV_INFO,
@@ -759,7 +766,6 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	if (!hns3_is_phys_func(h->pdev))

	if (!hns3_is_phys_func(h->pdev))

		return;

		return;





	dev_info(&h->pdev->dev, "dump qos buf cfg\n");

	dev_info(&h->pdev->dev, "dump mac tnl status\n");

	dev_info(&h->pdev->dev, "dump mac tnl status\n");

	dev_info(&h->pdev->dev, "dump qs shaper [qs id]\n");

	dev_info(&h->pdev->dev, "dump qs shaper [qs id]\n");

}

}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

+107 −79
Original line number Original line Diff line number Diff line
@@ -1090,199 +1090,225 @@ static int hclge_dbg_dump_qos_pri_map(struct hclge_dev *hdev, char *buf, 
	return 0;

	return 0;

}

}





static int hclge_dbg_dump_tx_buf_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_tx_buf_cfg(struct hclge_dev *hdev, char *buf, int len)

{

{

	struct hclge_tx_buff_alloc_cmd *tx_buf_cmd;

	struct hclge_tx_buff_alloc_cmd *tx_buf_cmd;

	struct hclge_desc desc;

	struct hclge_desc desc;

	int pos = 0;

	int i, ret;

	int i, ret;





	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_TX_BUFF_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_TX_BUFF_ALLOC, true);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump tx buf, ret = %d\n", ret);

		return ret;

		return ret;

	}





	dev_info(&hdev->pdev->dev, "dump qos buf cfg\n");

	tx_buf_cmd = (struct hclge_tx_buff_alloc_cmd *)desc.data;

	tx_buf_cmd = (struct hclge_tx_buff_alloc_cmd *)desc.data;

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

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

		dev_info(&hdev->pdev->dev, "tx_packet_buf_tc_%d: 0x%x\n", i,

		pos += scnprintf(buf + pos, len - pos,

				 "tx_packet_buf_tc_%d: 0x%x\n", i,

				 le16_to_cpu(tx_buf_cmd->tx_pkt_buff[i]));

				 le16_to_cpu(tx_buf_cmd->tx_pkt_buff[i]));





	return 0;

	return pos;

}

}





static int hclge_dbg_dump_rx_priv_buf_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_rx_priv_buf_cfg(struct hclge_dev *hdev, char *buf,

					  int len)

{

{

	struct hclge_rx_priv_buff_cmd *rx_buf_cmd;

	struct hclge_rx_priv_buff_cmd *rx_buf_cmd;

	struct hclge_desc desc;

	struct hclge_desc desc;

	int pos = 0;

	int i, ret;

	int i, ret;





	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_PRIV_BUFF_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_PRIV_BUFF_ALLOC, true);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump rx priv buf, ret = %d\n", ret);

		return ret;

		return ret;

	}



	pos += scnprintf(buf + pos, len - pos, "\n");





	dev_info(&hdev->pdev->dev, "\n");

	rx_buf_cmd = (struct hclge_rx_priv_buff_cmd *)desc.data;

	rx_buf_cmd = (struct hclge_rx_priv_buff_cmd *)desc.data;

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

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

		dev_info(&hdev->pdev->dev, "rx_packet_buf_tc_%d: 0x%x\n", i,

		pos += scnprintf(buf + pos, len - pos,

				 "rx_packet_buf_tc_%d: 0x%x\n", i,

				 le16_to_cpu(rx_buf_cmd->buf_num[i]));

				 le16_to_cpu(rx_buf_cmd->buf_num[i]));





	dev_info(&hdev->pdev->dev, "rx_share_buf: 0x%x\n",

	pos += scnprintf(buf + pos, len - pos, "rx_share_buf: 0x%x\n",

			 le16_to_cpu(rx_buf_cmd->shared_buf));

			 le16_to_cpu(rx_buf_cmd->shared_buf));





	return 0;

	return pos;

}

}





static int hclge_dbg_dump_rx_common_wl_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_rx_common_wl_cfg(struct hclge_dev *hdev, char *buf,

					   int len)

{

{

	struct hclge_rx_com_wl *rx_com_wl;

	struct hclge_rx_com_wl *rx_com_wl;

	struct hclge_desc desc;

	struct hclge_desc desc;

	int pos = 0;

	int ret;

	int ret;





	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_COM_WL_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_COM_WL_ALLOC, true);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump rx common wl, ret = %d\n", ret);

		return ret;

		return ret;

	}





	rx_com_wl = (struct hclge_rx_com_wl *)desc.data;

	rx_com_wl = (struct hclge_rx_com_wl *)desc.data;

	dev_info(&hdev->pdev->dev, "\n");

	pos += scnprintf(buf + pos, len - pos, "\n");

	dev_info(&hdev->pdev->dev, "rx_com_wl: high: 0x%x, low: 0x%x\n",

	pos += scnprintf(buf + pos, len - pos,

			 "rx_com_wl: high: 0x%x, low: 0x%x\n",

			 le16_to_cpu(rx_com_wl->com_wl.high),

			 le16_to_cpu(rx_com_wl->com_wl.high),

			 le16_to_cpu(rx_com_wl->com_wl.low));

			 le16_to_cpu(rx_com_wl->com_wl.low));





	return 0;

	return pos;

}

}





static int hclge_dbg_dump_rx_global_pkt_cnt(struct hclge_dev *hdev)

static int hclge_dbg_dump_rx_global_pkt_cnt(struct hclge_dev *hdev, char *buf,

					    int len)

{

{

	struct hclge_rx_com_wl *rx_packet_cnt;

	struct hclge_rx_com_wl *rx_packet_cnt;

	struct hclge_desc desc;

	struct hclge_desc desc;

	int pos = 0;

	int ret;

	int ret;





	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_GBL_PKT_CNT, true);

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_RX_GBL_PKT_CNT, true);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump rx global pkt cnt, ret = %d\n", ret);

		return ret;

		return ret;

	}





	rx_packet_cnt = (struct hclge_rx_com_wl *)desc.data;

	rx_packet_cnt = (struct hclge_rx_com_wl *)desc.data;

	dev_info(&hdev->pdev->dev,

	pos += scnprintf(buf + pos, len - pos,

			 "rx_global_packet_cnt: high: 0x%x, low: 0x%x\n",

			 "rx_global_packet_cnt: high: 0x%x, low: 0x%x\n",

			 le16_to_cpu(rx_packet_cnt->com_wl.high),

			 le16_to_cpu(rx_packet_cnt->com_wl.high),

			 le16_to_cpu(rx_packet_cnt->com_wl.low));

			 le16_to_cpu(rx_packet_cnt->com_wl.low));





	return 0;

	return pos;

}

}





static int hclge_dbg_dump_rx_priv_wl_buf_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_rx_priv_wl_buf_cfg(struct hclge_dev *hdev, char *buf,

					     int len)

{

{

	struct hclge_rx_priv_wl_buf *rx_priv_wl;

	struct hclge_rx_priv_wl_buf *rx_priv_wl;

	struct hclge_desc desc[2];

	struct hclge_desc desc[2];

	int pos = 0;

	int i, ret;

	int i, ret;





	hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_RX_PRIV_WL_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_RX_PRIV_WL_ALLOC, true);

	desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT);

	desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT);

	hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_RX_PRIV_WL_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_RX_PRIV_WL_ALLOC, true);

	ret = hclge_cmd_send(&hdev->hw, desc, 2);

	ret = hclge_cmd_send(&hdev->hw, desc, 2);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump rx priv wl buf, ret = %d\n", ret);

		return ret;

		return ret;

	}





	rx_priv_wl = (struct hclge_rx_priv_wl_buf *)desc[0].data;

	rx_priv_wl = (struct hclge_rx_priv_wl_buf *)desc[0].data;

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

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

		dev_info(&hdev->pdev->dev,

		pos += scnprintf(buf + pos, len - pos,

			 "rx_priv_wl_tc_%d: high: 0x%x, low: 0x%x\n", i,

			 "rx_priv_wl_tc_%d: high: 0x%x, low: 0x%x\n", i,

			 le16_to_cpu(rx_priv_wl->tc_wl[i].high),

			 le16_to_cpu(rx_priv_wl->tc_wl[i].high),

			 le16_to_cpu(rx_priv_wl->tc_wl[i].low));

			 le16_to_cpu(rx_priv_wl->tc_wl[i].low));





	rx_priv_wl = (struct hclge_rx_priv_wl_buf *)desc[1].data;

	rx_priv_wl = (struct hclge_rx_priv_wl_buf *)desc[1].data;

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

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

		dev_info(&hdev->pdev->dev,

		pos += scnprintf(buf + pos, len - pos,

			 "rx_priv_wl_tc_%d: high: 0x%x, low: 0x%x\n",

			 "rx_priv_wl_tc_%d: high: 0x%x, low: 0x%x\n",

			 i + HCLGE_TC_NUM_ONE_DESC,

			 i + HCLGE_TC_NUM_ONE_DESC,

			 le16_to_cpu(rx_priv_wl->tc_wl[i].high),

			 le16_to_cpu(rx_priv_wl->tc_wl[i].high),

			 le16_to_cpu(rx_priv_wl->tc_wl[i].low));

			 le16_to_cpu(rx_priv_wl->tc_wl[i].low));





	return 0;

	return pos;

}

}





static int hclge_dbg_dump_rx_common_threshold_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_rx_common_threshold_cfg(struct hclge_dev *hdev,

						  char *buf, int len)

{

{

	struct hclge_rx_com_thrd *rx_com_thrd;

	struct hclge_rx_com_thrd *rx_com_thrd;

	struct hclge_desc desc[2];

	struct hclge_desc desc[2];

	int pos = 0;

	int i, ret;

	int i, ret;





	hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_RX_COM_THRD_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_RX_COM_THRD_ALLOC, true);

	desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT);

	desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT);

	hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_RX_COM_THRD_ALLOC, true);

	hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_RX_COM_THRD_ALLOC, true);

	ret = hclge_cmd_send(&hdev->hw, desc, 2);

	ret = hclge_cmd_send(&hdev->hw, desc, 2);

	if (ret)

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to dump rx common threshold, ret = %d\n", ret);

		return ret;

		return ret;

	}





	dev_info(&hdev->pdev->dev, "\n");

	pos += scnprintf(buf + pos, len - pos, "\n");

	rx_com_thrd = (struct hclge_rx_com_thrd *)desc[0].data;

	rx_com_thrd = (struct hclge_rx_com_thrd *)desc[0].data;

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

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

		dev_info(&hdev->pdev->dev,

		pos += scnprintf(buf + pos, len - pos,

			 "rx_com_thrd_tc_%d: high: 0x%x, low: 0x%x\n", i,

			 "rx_com_thrd_tc_%d: high: 0x%x, low: 0x%x\n", i,

			 le16_to_cpu(rx_com_thrd->com_thrd[i].high),

			 le16_to_cpu(rx_com_thrd->com_thrd[i].high),

			 le16_to_cpu(rx_com_thrd->com_thrd[i].low));

			 le16_to_cpu(rx_com_thrd->com_thrd[i].low));





	rx_com_thrd = (struct hclge_rx_com_thrd *)desc[1].data;

	rx_com_thrd = (struct hclge_rx_com_thrd *)desc[1].data;

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

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

		dev_info(&hdev->pdev->dev,

		pos += scnprintf(buf + pos, len - pos,

			 "rx_com_thrd_tc_%d: high: 0x%x, low: 0x%x\n",

			 "rx_com_thrd_tc_%d: high: 0x%x, low: 0x%x\n",

			 i + HCLGE_TC_NUM_ONE_DESC,

			 i + HCLGE_TC_NUM_ONE_DESC,

			 le16_to_cpu(rx_com_thrd->com_thrd[i].high),

			 le16_to_cpu(rx_com_thrd->com_thrd[i].high),

			 le16_to_cpu(rx_com_thrd->com_thrd[i].low));

			 le16_to_cpu(rx_com_thrd->com_thrd[i].low));





	return 0;

	return pos;

}

}





static void hclge_dbg_dump_qos_buf_cfg(struct hclge_dev *hdev)

static int hclge_dbg_dump_qos_buf_cfg(struct hclge_dev *hdev, char *buf,

				      int len)

{

{

	enum hclge_opcode_type cmd;

	int pos = 0;

	int ret;

	int ret;





	cmd = HCLGE_OPC_TX_BUFF_ALLOC;

	ret = hclge_dbg_dump_tx_buf_cfg(hdev, buf + pos, len - pos);

	ret = hclge_dbg_dump_tx_buf_cfg(hdev);

	if (ret < 0)

	if (ret)

		return ret;

		goto err_qos_cmd_send;

	pos += ret;



	cmd = HCLGE_OPC_RX_PRIV_BUFF_ALLOC;

	ret = hclge_dbg_dump_rx_priv_buf_cfg(hdev);

	if (ret)

		goto err_qos_cmd_send;





	cmd = HCLGE_OPC_RX_COM_WL_ALLOC;

	ret = hclge_dbg_dump_rx_priv_buf_cfg(hdev, buf + pos, len - pos);

	ret = hclge_dbg_dump_rx_common_wl_cfg(hdev);

	if (ret < 0)

	if (ret)

		return ret;

		goto err_qos_cmd_send;

	pos += ret;





	cmd = HCLGE_OPC_RX_GBL_PKT_CNT;

	ret = hclge_dbg_dump_rx_common_wl_cfg(hdev, buf + pos, len - pos);

	ret = hclge_dbg_dump_rx_global_pkt_cnt(hdev);

	if (ret < 0)

	if (ret)

		return ret;

		goto err_qos_cmd_send;

	pos += ret;





	dev_info(&hdev->pdev->dev, "\n");

	ret = hclge_dbg_dump_rx_global_pkt_cnt(hdev, buf + pos, len - pos);

	if (!hnae3_dev_dcb_supported(hdev)) {

	if (ret < 0)

		dev_info(&hdev->pdev->dev,

		return ret;

			 "Only DCB-supported dev supports rx priv wl\n");

	pos += ret;

		return;

	}





	cmd = HCLGE_OPC_RX_PRIV_WL_ALLOC;

	pos += scnprintf(buf + pos, len - pos, "\n");

	ret = hclge_dbg_dump_rx_priv_wl_buf_cfg(hdev);

	if (!hnae3_dev_dcb_supported(hdev))

	if (ret)

		return 0;

		goto err_qos_cmd_send;





	cmd = HCLGE_OPC_RX_COM_THRD_ALLOC;

	ret = hclge_dbg_dump_rx_priv_wl_buf_cfg(hdev, buf + pos, len - pos);

	ret = hclge_dbg_dump_rx_common_threshold_cfg(hdev);

	if (ret < 0)

	if (ret)

		return ret;

		goto err_qos_cmd_send;

	pos += ret;





	return;

	ret = hclge_dbg_dump_rx_common_threshold_cfg(hdev, buf + pos,

						     len - pos);

	if (ret < 0)

		return ret;





err_qos_cmd_send:

	return 0;

	dev_err(&hdev->pdev->dev,

		"dump qos buf cfg fail(0x%x), ret = %d\n", cmd, ret);

}

}





static int hclge_dbg_dump_mng_table(struct hclge_dev *hdev, char *buf, int len)

static int hclge_dbg_dump_mng_table(struct hclge_dev *hdev, char *buf, int len)
@@ -1905,9 +1931,7 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	struct hclge_dev *hdev = vport->back;





	if (strncmp(cmd_buf, "dump qos buf cfg", 16) == 0) {

	if (strncmp(cmd_buf, "dump serv info", 14) == 0) {

		hclge_dbg_dump_qos_buf_cfg(hdev);

	} else if (strncmp(cmd_buf, "dump serv info", 14) == 0) {

		hclge_dbg_dump_serv_info(hdev);

		hclge_dbg_dump_serv_info(hdev);

	} else if (strncmp(cmd_buf, "dump mac tnl status", 19) == 0) {

	} else if (strncmp(cmd_buf, "dump mac tnl status", 19) == 0) {

		hclge_dbg_dump_mac_tnl_status(hdev);

		hclge_dbg_dump_mac_tnl_status(hdev);
@@ -1959,6 +1983,10 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = { 
		.cmd = HNAE3_DBG_CMD_QOS_PRI_MAP,

		.cmd = HNAE3_DBG_CMD_QOS_PRI_MAP,

		.dbg_dump = hclge_dbg_dump_qos_pri_map,

		.dbg_dump = hclge_dbg_dump_qos_pri_map,

	},

	},

	{

		.cmd = HNAE3_DBG_CMD_QOS_BUF_CFG,

		.dbg_dump = hclge_dbg_dump_qos_buf_cfg,

	},

	{

	{

		.cmd = HNAE3_DBG_CMD_MAC_UC,

		.cmd = HNAE3_DBG_CMD_MAC_UC,

		.dbg_dump = hclge_dbg_dump_mac_uc,

		.dbg_dump = hclge_dbg_dump_mac_uc,