Commit 7b07ab06 authored by Jiaran Zhang's avatar Jiaran Zhang Committed by David S. Miller
Browse files

net: hns3: refactor dump mac tnl status of debugfs 



Currently, the debugfs command for dump mac tnl status is
implemented by "echo xxxx > cmd", and record the information
in dmesg. It's unnecessary and heavy. To improve it, create
a single file "mac_tnl_status" for it, and query it by command
"cat mac_tnl_status", return the result to userspace, rather
than record in dmesg.

The display style is below:
$ cat mac_tnl_status
Recently generated mac tnl interruption:
[0111204.175437] status = 0x30
[0154120.329912] status = 0x30

Signed-off-by: default avatarJiaran Zhang <zhangjiaran@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 484e1ed1

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

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

	HNAE3_DBG_CMD_TX_QUEUE_INFO,

	HNAE3_DBG_CMD_FD_TCAM,

	HNAE3_DBG_CMD_MAC_TNL_STATUS,

	HNAE3_DBG_CMD_UNKNOWN,

};

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

+7 −5
Original line number Diff line number Diff line
@@ -190,6 +190,13 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = { 
		.buf_len = HNS3_DBG_READ_LEN_128KB,

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "mac_tnl_status",

		.cmd = HNAE3_DBG_CMD_MAC_TNL_STATUS,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "bios_common",

		.cmd = HNAE3_DBG_CMD_REG_BIOS_COMMON,
@@ -762,11 +769,6 @@ static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len) 
static void hns3_dbg_help(struct hnae3_handle *h)

{

	dev_info(&h->pdev->dev, "available commands\n");



	if (!hns3_is_phys_func(h->pdev))

		return;



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

}



static void

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

+16 −7
Original line number Diff line number Diff line
@@ -1807,21 +1807,28 @@ static int hclge_dbg_dump_loopback(struct hclge_dev *hdev, char *buf, int len) 
/* hclge_dbg_dump_mac_tnl_status: print message about mac tnl interrupt

 * @hdev: pointer to struct hclge_dev

 */

static void hclge_dbg_dump_mac_tnl_status(struct hclge_dev *hdev)

static int

hclge_dbg_dump_mac_tnl_status(struct hclge_dev *hdev, char *buf, int len)

{

#define HCLGE_BILLION_NANO_SECONDS 1000000000



	struct hclge_mac_tnl_stats stats;

	unsigned long rem_nsec;

	int pos = 0;



	dev_info(&hdev->pdev->dev, "Recently generated mac tnl interruption:\n");

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

			 "Recently generated mac tnl interruption:\n");



	while (kfifo_get(&hdev->mac_tnl_log, &stats)) {

		rem_nsec = do_div(stats.time, HCLGE_BILLION_NANO_SECONDS);

		dev_info(&hdev->pdev->dev, "[%07lu.%03lu] status = 0x%x\n",



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

				 "[%07lu.%03lu] status = 0x%x\n",

				 (unsigned long)stats.time, rem_nsec / 1000,

				 stats.status);

	}



	return 0;

}
@@ -1895,8 +1902,6 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 


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

		hclge_dbg_dump_serv_info(hdev);

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

		hclge_dbg_dump_mac_tnl_status(hdev);

	} else {

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

		return -EINVAL;
@@ -2026,6 +2031,10 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = { 
		.cmd = HNAE3_DBG_CMD_FD_TCAM,

		.dbg_dump = hclge_dbg_dump_fd_tcam,

	},

	{

		.cmd = HNAE3_DBG_CMD_MAC_TNL_STATUS,

		.dbg_dump = hclge_dbg_dump_mac_tnl_status,

	},

};



int hclge_dbg_read_cmd(struct hnae3_handle *handle, enum hnae3_dbg_cmd cmd,