Commit 9149ca0f authored by Jiaran Zhang's avatar Jiaran Zhang Committed by David S. Miller
Browse files

net: hns3: refactor dump intr of debugfs 



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

The display style is below:
$cat interrupt_info
num_nic_msi: 65
num_roce_msi: 65
num_msi_used: 2
num_msi_left: 128

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 d658ff34

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

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

	HNAE3_DBG_CMD_MNG_TBL,

	HNAE3_DBG_CMD_LOOPBACK,

	HNAE3_DBG_CMD_INTERRUPT_INFO,

	HNAE3_DBG_CMD_UNKNOWN,

};

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

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

		.init = hns3_dbg_common_file_init,

	},

	{

		.name = "interrupt_info",

		.cmd = HNAE3_DBG_CMD_INTERRUPT_INFO,

		.dentry = HNS3_DBG_DENTRY_COMMON,

		.buf_len = HNS3_DBG_READ_LEN,

		.init = hns3_dbg_common_file_init,

	},

};



static struct hns3_dbg_cap_info hns3_dbg_cap[] = {
@@ -503,7 +510,6 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	dev_info(&h->pdev->dev, "dump ncl_config <offset> <length>(in hex)\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 intr\n");



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg [[bios common] [ssu <port_id>]",

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

+17 −9
Original line number Diff line number Diff line
@@ -1430,12 +1430,20 @@ static void hclge_dbg_dump_serv_info(struct hclge_dev *hdev) 
		 hdev->serv_processed_cnt);

}



static void hclge_dbg_dump_interrupt(struct hclge_dev *hdev)

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

{

	dev_info(&hdev->pdev->dev, "num_nic_msi: %u\n", hdev->num_nic_msi);

	dev_info(&hdev->pdev->dev, "num_roce_msi: %u\n", hdev->num_roce_msi);

	dev_info(&hdev->pdev->dev, "num_msi_used: %u\n", hdev->num_msi_used);

	dev_info(&hdev->pdev->dev, "num_msi_left: %u\n", hdev->num_msi_left);

	int pos = 0;



	pos += scnprintf(buf + pos, len - pos, "num_nic_msi: %u\n",

			 hdev->num_nic_msi);

	pos += scnprintf(buf + pos, len - pos, "num_roce_msi: %u\n",

			 hdev->num_roce_msi);

	pos += scnprintf(buf + pos, len - pos, "num_msi_used: %u\n",

			 hdev->num_msi_used);

	pos += scnprintf(buf + pos, len - pos, "num_msi_left: %u\n",

			 hdev->num_msi_left);



	return 0;

}



static void hclge_dbg_get_m7_stats_info(struct hclge_dev *hdev)
@@ -1791,7 +1799,6 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
{

#define DUMP_REG	"dump reg"

#define DUMP_TM_MAP	"dump tm map"

#define DUMP_INTERRUPT	"dump intr"



	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;
@@ -1826,9 +1833,6 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
	} else if (strncmp(cmd_buf, "dump qs shaper", 14) == 0) {

		hclge_dbg_dump_qs_shaper(hdev,

					 &cmd_buf[sizeof("dump qs shaper")]);

	} else if (strncmp(cmd_buf, DUMP_INTERRUPT,

		   strlen(DUMP_INTERRUPT)) == 0) {

		hclge_dbg_dump_interrupt(hdev);

	} else {

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

		return -EINVAL;
@@ -1866,6 +1870,10 @@ static const struct hclge_dbg_func hclge_dbg_cmd_func[] = { 
		.cmd = HNAE3_DBG_CMD_LOOPBACK,

		.dbg_dump = hclge_dbg_dump_loopback,

	},

	{

		.cmd = HNAE3_DBG_CMD_INTERRUPT_INFO,

		.dbg_dump = hclge_dbg_dump_interrupt,

	},

};



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