net: hns3: refactor dump tc of debugfs

Currently, user gets tc schedule info by implementing debugfs command
"echo dump tc > cmd", this command will dump info in dmesg. It's
unnecessary and heavy.

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

The display style is below:
$ cat tc_sch_info
enabled tc number: 4
weight_offset: 14
TC    MODE  WEIGHT
0     dwrr     25
1     dwrr     25
2     dwrr     25
3     dwrr     25
4     dwrr      0
5     dwrr      0
6     dwrr      0
7     dwrr      0

Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guangbin Huang 2021-05-20 10:21:37 +08:00 committed by David S. Miller
parent cad7c215a4
commit 0e32038dc8
3 changed files with 37 additions and 27 deletions

View File

@ -257,6 +257,7 @@ enum hnae3_dbg_cmd {
HNAE3_DBG_CMD_TM_MAP, HNAE3_DBG_CMD_TM_MAP,
HNAE3_DBG_CMD_TM_PG, HNAE3_DBG_CMD_TM_PG,
HNAE3_DBG_CMD_TM_PORT, HNAE3_DBG_CMD_TM_PORT,
HNAE3_DBG_CMD_TC_SCH_INFO,
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,

View File

@ -85,6 +85,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 = "tc_sch_info",
.cmd = HNAE3_DBG_CMD_TC_SCH_INFO,
.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,
@ -738,7 +745,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 tc\n");
dev_info(&h->pdev->dev, "dump qos pause cfg\n"); dev_info(&h->pdev->dev, "dump qos pause cfg\n");
dev_info(&h->pdev->dev, "dump qos pri map\n"); dev_info(&h->pdev->dev, "dump qos pri map\n");
dev_info(&h->pdev->dev, "dump qos buf cfg\n"); dev_info(&h->pdev->dev, "dump qos buf cfg\n");

View File

@ -645,44 +645,45 @@ static int hclge_dbg_dump_reg_cmd(struct hclge_dev *hdev,
return ret; return ret;
} }
static void hclge_print_tc_info(struct hclge_dev *hdev, bool flag, int index) static int hclge_dbg_dump_tc(struct hclge_dev *hdev, char *buf, int len)
{
if (flag)
dev_info(&hdev->pdev->dev, "tc(%d): no sp mode weight: %u\n",
index, hdev->tm_info.pg_info[0].tc_dwrr[index]);
else
dev_info(&hdev->pdev->dev, "tc(%d): sp mode\n", index);
}
static void hclge_dbg_dump_tc(struct hclge_dev *hdev)
{ {
struct hclge_ets_tc_weight_cmd *ets_weight; struct hclge_ets_tc_weight_cmd *ets_weight;
struct hclge_desc desc; struct hclge_desc desc;
int i, ret; char *sch_mode_str;
int pos = 0;
int ret;
u8 i;
if (!hnae3_dev_dcb_supported(hdev)) { if (!hnae3_dev_dcb_supported(hdev)) {
dev_info(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"Only DCB-supported dev supports tc\n"); "Only DCB-supported dev supports tc\n");
return; return -EOPNOTSUPP;
} }
hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_ETS_TC_WEIGHT, true); hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_ETS_TC_WEIGHT, 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, "dump tc fail, ret = %d\n", ret); dev_err(&hdev->pdev->dev, "failed to get tc weight, ret = %d\n",
return; ret);
return ret;
} }
ets_weight = (struct hclge_ets_tc_weight_cmd *)desc.data; ets_weight = (struct hclge_ets_tc_weight_cmd *)desc.data;
dev_info(&hdev->pdev->dev, "dump tc: %u tc enabled\n", pos += scnprintf(buf + pos, len - pos, "enabled tc number: %u\n",
hdev->tm_info.num_tc); hdev->tm_info.num_tc);
dev_info(&hdev->pdev->dev, "weight_offset: %u\n", pos += scnprintf(buf + pos, len - pos, "weight_offset: %u\n",
ets_weight->weight_offset); ets_weight->weight_offset);
for (i = 0; i < HNAE3_MAX_TC; i++) pos += scnprintf(buf + pos, len - pos, "TC MODE WEIGHT\n");
hclge_print_tc_info(hdev, ets_weight->tc_weight[i], i); for (i = 0; i < HNAE3_MAX_TC; i++) {
sch_mode_str = ets_weight->tc_weight[i] ? "dwrr" : "sp";
pos += scnprintf(buf + pos, len - pos, "%u %4s %3u\n",
i, sch_mode_str,
hdev->tm_info.pg_info[0].tc_dwrr[i]);
}
return 0;
} }
static const struct hclge_dbg_item tm_pg_items[] = { static const struct hclge_dbg_item tm_pg_items[] = {
@ -1893,9 +1894,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 tc", 7) == 0) { if (strncmp(cmd_buf, "dump qos pause cfg", 18) == 0) {
hclge_dbg_dump_tc(hdev);
} else if (strncmp(cmd_buf, "dump qos pause cfg", 18) == 0) {
hclge_dbg_dump_qos_pause_cfg(hdev); hclge_dbg_dump_qos_pause_cfg(hdev);
} else if (strncmp(cmd_buf, "dump qos pri map", 16) == 0) { } else if (strncmp(cmd_buf, "dump qos pri map", 16) == 0) {
hclge_dbg_dump_qos_pri_map(hdev); hclge_dbg_dump_qos_pri_map(hdev);
@ -1941,6 +1940,10 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = {
.cmd = HNAE3_DBG_CMD_TM_PORT, .cmd = HNAE3_DBG_CMD_TM_PORT,
.dbg_dump = hclge_dbg_dump_tm_port, .dbg_dump = hclge_dbg_dump_tm_port,
}, },
{
.cmd = HNAE3_DBG_CMD_TC_SCH_INFO,
.dbg_dump = hclge_dbg_dump_tc,
},
{ {
.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,