On 2021/2/2 5:25, Nathan Chancellor wrote:
On Thu, Jan 28, 2021 at 07:51:36PM +0800, Huazhong Tan wrote:
From: Guangbin Huang huangguangbin2@huawei.com
In order to query tm info of nodes, priority and qset for debugging, adds three debugfs files tm_nodes, tm_priority and tm_qset in newly created tm directory.
Unlike previous debugfs commands, these three files just support read ops, so they only support to use cat command to dump their info.
The new tm file style is acccording to suggestion from Jakub Kicinski's opinion as link https://lkml.org/lkml/2020/9/29/2101.
Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: Huazhong Tan tanhuazhong@huawei.com
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 8 ++ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 55 +++++++- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 153 +++++++++++++++++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + 5 files changed, 218 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index a7daf6d..fe09cf6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -465,6 +465,8 @@ struct hnae3_ae_dev {
- Delete clsflower rule
- cls_flower_active
- Check if any cls flower rule exist
- dbg_read_cmd
*/ struct hnae3_ae_ops { int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
- Execute debugfs read command.
@@ -620,6 +622,8 @@ struct hnae3_ae_ops { int (*add_arfs_entry)(struct hnae3_handle *handle, u16 queue_id, u16 flow_id, struct flow_keys *fkeys); int (*dbg_run_cmd)(struct hnae3_handle *handle, const char *cmd_buf);
- int (*dbg_read_cmd)(struct hnae3_handle *handle, const char *cmd_buf,
char *buf, int len);@@ -777,6 +781,10 @@ struct hnae3_handle { #define hnae3_get_bit(origin, shift) \ hnae3_get_field((origin), (0x1 << (shift)), (shift))
+#define HNAE3_DBG_TM_NODES "tm_nodes" +#define HNAE3_DBG_TM_PRI "tm_priority" +#define HNAE3_DBG_TM_QSET "tm_qset"
- int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev); void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c index 9d4e9c0..6978304 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c @@ -7,7 +7,7 @@ #include "hnae3.h" #include "hns3_enet.h"
-#define HNS3_DBG_READ_LEN 256 +#define HNS3_DBG_READ_LEN 65536 #define HNS3_DBG_WRITE_LEN 1024
static struct dentry *hns3_dbgfs_root; @@ -484,6 +484,42 @@ static ssize_t hns3_dbg_cmd_write(struct file *filp, const char __user *buffer, return count; }
+static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer,
size_t count, loff_t *ppos)+{
- struct hnae3_handle *handle = filp->private_data;
- const struct hnae3_ae_ops *ops = handle->ae_algo->ops;
- struct hns3_nic_priv *priv = handle->priv;
- char *cmd_buf, *read_buf;
- ssize_t size = 0;
- int ret = 0;
- if (!filp->f_path.dentry->d_iname)
return -EINVAL;Clang warns this check is pointless:
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c:497:28: warning: address of array 'filp->f_path.dentry->d_iname' will always evaluate to 'true' [-Wpointer-bool-conversion] if (!filp->f_path.dentry->d_iname) ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ 1 warning generated.
Was it intended to be something else or can it just be removed?
yes, it is unnecessary, will remove it later.
Thanks.
- read_buf = kzalloc(HNS3_DBG_READ_LEN, GFP_KERNEL);
- if (!read_buf)
return -ENOMEM;- cmd_buf = filp->f_path.dentry->d_iname;
- if (ops->dbg_read_cmd)
ret = ops->dbg_read_cmd(handle, cmd_buf, read_buf,HNS3_DBG_READ_LEN);- if (ret) {
dev_info(priv->dev, "unknown command\n");goto out;- }
- size = simple_read_from_buffer(buffer, count, ppos, read_buf,
strlen(read_buf));+out:
- kfree(read_buf);
- return size;
+}
Cheers, Nathan
.