hinic: add debugfs support
Subsystems (3)
PATCH 1/1 hinic: add debugfs support
add debugfs node for querying sq/rq info, mac table, sq ci table, rq cqe info, global table, function table, port and vlan table.
--- drivers/net/ethernet/huawei/hinic/Makefile | 3 +- .../net/ethernet/huawei/hinic/hinic_debugfs.c | 1354 +++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_debugfs.h | 769 ++++++++++ drivers/net/ethernet/huawei/hinic/hinic_dev.h | 2 + .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 25 + .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 25 + .../net/ethernet/huawei/hinic/hinic_hw_io.h | 1 + .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 1 + .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 2 + .../net/ethernet/huawei/hinic/hinic_hw_wq.c | 5 + .../net/ethernet/huawei/hinic/hinic_hw_wq.h | 2 + .../net/ethernet/huawei/hinic/hinic_main.c | 20 +- 12 files changed, 2207 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.c create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.h
drivers/net/ethernet/huawei/hinic/Makefile +2 -1
@@ -4,4 +4,5 @@ obj-$(CONFIG_HINIC) += hinic.o hinic-y := hinic_main.o hinic_tx.o hinic_rx.o hinic_port.o hinic_hw_dev.o \ hinic_hw_io.o hinic_hw_qp.o hinic_hw_cmdq.o hinic_hw_wq.o \ hinic_hw_mgmt.o hinic_hw_api_cmd.o hinic_hw_eqs.o hinic_hw_if.o \ - hinic_common.o hinic_ethtool.o hinic_devlink.o hinic_hw_mbox.o hinic_sriov.o + hinic_common.o hinic_ethtool.o hinic_devlink.o hinic_hw_mbox.o \ + hinic_sriov.o hinic_debugfs.o
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c new file +1354 -0
1,354 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_debugfs.h new file +769 -0
769 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_dev.h +2 -0
@@ -97,6 +97,8 @@ struct hinic_dev {int lb_test_rx_idx;int lb_pkt_len;u8 *lb_test_rx_buf; + +struct dentry *hinic_dbgfs;struct devlink *devlink;bool cable_unplugged;bool module_unrecognized;
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +25 -0
@@ -465,6 +465,7 @@ int hinic_hwdev_ifup(struct hinic_hwdev *hwdev, u16 sq_depth, u16 rq_depth) func_to_io->hwdev = hwdev; func_to_io->sq_depth = sq_depth; func_to_io->rq_depth = rq_depth; + func_to_io->global_qpn = base_qpn; err =hinic_io_init (func_to_io, hwif, nic_cap->max_qps, num_ceqs, ceq_msix_entries);
@@ -1175,6 +1176,30 @@ int hinic_hwdev_hw_ci_addr_set(struct hinic_hwdev *hwdev, struct hinic_sq *sq, NULL, HINIC_MGMT_MSG_SYNC); } +int hinic_hwdev_hw_ci_table_get (struct hinic_hwdev *hwdev, +struct hinic_cmd_get_hw_ci_tbl *ci_table) +{ +u16 out_size =sizeof (*ci_table); +struct hinic_pfhwdev *pfhwdev; +int err; + + pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev); + err =hinic_msg_to_mgmt (&pfhwdev->pf_to_mgmt, +HINIC_MOD_COMM , +HINIC_COMM_CMD_SQ_HI_CI_GET , + ci_table,sizeof (*ci_table), ci_table, + &out_size,HINIC_MGMT_MSG_SYNC ); + +if (err || ci_table->status || !out_size) { +dev_err (&hwdev->hwif->pdev->dev, +"Failed to get ci table, err: %d, status: 0x%x, out size: 0x%x\n" , + err, ci_table->status, out_size); +return -EIO ; + } + +return 0 ; +} +/** * hinic_hwdev_set_msix_state- set msix state * @hwdev: the NIC HW device
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h +25 -0
@@ -96,6 +96,8 @@ enum hinic_port_cmd {HINIC_PORT_CMD_RSS_TEMP_MGR =49 , +HINIC_PORT_CMD_RD_LINE_TBL =57 , +HINIC_PORT_CMD_RSS_CFG =66 , HINIC_PORT_CMD_FWCTXT_INIT = 69,
@@ -135,6 +137,8 @@ enum hinic_port_cmd {HINIC_PORT_CMD_SET_AUTONEG =219 , +HINIC_PORT_CMD_GET_SML_TABLE =224 , +HINIC_PORT_CMD_GET_STD_SFP_INFO =240 , HINIC_PORT_CMD_SET_LRO_TIMER = 244,
@@ -291,6 +295,24 @@ struct hinic_cmd_hw_ci {u64 ci_addr; }; +struct hinic_cmd_get_hw_ci_tbl { +u8 status; +u8 version; +u8 rsvd0[6 ]; + +u16 func_idx; +u8 dma_attr_off; +u8 pending_limit; + +u8 coalesce_time; +u8 int_en; +u16 int_offset; + +u32 l2nic_sqn; +u32 rsv; +u64 ci_addr;/* bit[63:2] is addr's high 62bit, bit[0] is valid flag */ +}; +struct hinic_cmd_l2nic_reset {u8 status;u8 version;
@@ -582,6 +604,9 @@ int hinic_hwdev_msix_set(struct hinic_hwdev *hwdev, u16 msix_index,int hinic_hwdev_hw_ci_addr_set (struct hinic_hwdev *hwdev,struct hinic_sq *sq,u8 pending_limit,u8 coalesc_timer); +int hinic_hwdev_hw_ci_table_get (struct hinic_hwdev *hwdev, +struct hinic_cmd_get_hw_ci_tbl *ci_table); +void hinic_hwdev_set_msix_state (struct hinic_hwdev *hwdev,u16 msix_index,enum hinic_msix_state flag);
drivers/net/ethernet/huawei/hinic/hinic_hw_io.h +1 -0
@@ -59,6 +59,7 @@ struct hinic_nic_cfg {struct hinic_func_to_io {struct hinic_hwif *hwif;struct hinic_hwdev *hwdev; +u16 global_qpn;struct hinic_ceqs ceqs;struct hinic_wqs wqs;
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +1 -0
@@ -1357,6 +1357,7 @@ static struct vf_cmd_check_handle hw_cmd_support_vf[] = { {HINIC_COMM_CMD_HWCTXT_SET, check_hwctxt}, {HINIC_COMM_CMD_HWCTXT_GET, check_hwctxt}, {HINIC_COMM_CMD_SQ_HI_CI_SET, hinic_mbox_check_func_id_8B}, + {HINIC_COMM_CMD_SQ_HI_CI_GET, hinic_mbox_check_func_id_8B}, {HINIC_COMM_CMD_RES_STATE_SET, hinic_mbox_check_func_id_8B}, {HINIC_COMM_CMD_IO_RES_CLEAR, hinic_mbox_check_func_id_8B}, {HINIC_COMM_CMD_CEQ_CTRL_REG_WR_BY_UP, hinic_mbox_check_func_id_8B},
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h +2 -0
@@ -72,6 +72,8 @@ enum hinic_comm_cmd {HINIC_COMM_CMD_SQ_HI_CI_SET =0x14 , +HINIC_COMM_CMD_SQ_HI_CI_GET =0x15 , +HINIC_COMM_CMD_RES_STATE_SET =0x24 , HINIC_COMM_CMD_IO_RES_CLEAR = 0x29,
drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c +5 -0
@@ -901,3 +901,8 @@ void hinic_write_wqe(struct hinic_wq *wq, struct hinic_hw_wqe *wqe,copy_wqe_from_shadow (wq, shadow_addr, num_wqebbs, prod_idx); } } + +void *hinic_get_wqebb_addr (struct hinic_wq *wq,u16 index) +{ +return WQ_PAGE_ADDR (wq, index) +WQE_PAGE_OFF (wq, index); +}
drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h +2 -0
@@ -108,4 +108,6 @@ struct hinic_hw_wqe *hinic_read_wqe_direct(struct hinic_wq *wq, u16 cons_idx);void hinic_write_wqe (struct hinic_wq *wq,struct hinic_hw_wqe *wqe,unsigned int wqe_size); +void *hinic_get_wqebb_addr (struct hinic_wq *wq,u16 index); +#endif
drivers/net/ethernet/huawei/hinic/hinic_main.c +19 -1
@@ -24,6 +24,7 @@#include <linux/delay.h> #include <linux/err.h> +#include "hinic_debugfs.h" #include "hinic_hw_qp.h" #include "hinic_hw_dev.h" #include "hinic_devlink.h"
@@ -1266,6 +1267,8 @@ static int nic_dev_init(struct pci_dev *pdev) goto err_reg_netdev; } +hinic_dbg_init (nic_dev); +return 0 ; err_reg_netdev:
@@ -1384,6 +1387,8 @@ static void hinic_remove(struct pci_dev *pdev)struct devlink *devlink = nic_dev->devlink;struct hinic_rx_mode_work *rx_mode_work; +hinic_dbg_uninit (nic_dev); +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) {wait_sriov_cfg_complete (nic_dev);hinic_pci_sriov_disable (pdev);
@@ -1445,4 +1450,17 @@ static struct pci_driver hinic_driver = { .sriov_configure = hinic_pci_sriov_configure, }; -module_pci_driver (hinic_driver); +static int __init hinic_module_init (void ) +{ +hinic_dbg_register_debugfs (HINIC_DRV_NAME ); +return pci_register_driver (&hinic_driver); +} + +static void __exit hinic_module_exit(void) +{ +pci_unregister_driver (&hinic_driver); +hinic_dbg_unregister_debugfs (); +} + +module_init (hinic_module_init); +module_exit (hinic_module_exit);
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerQuoted 19 lines · On Thu, 20 Aug 2020 20:14:32 +0800 Luo bin wrote:
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c new file +19
-0+static int hinic_dbg_help (struct hinic_dev *nic_dev,const char *cmd_buf) +{ +netif_info (nic_dev, drv, nic_dev->netdev,"Available commands:\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq info <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq wqe info <queue id> <wqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq info <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq wqe info <queue id> <wqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq ci table <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq cqe info <queue id> <cqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"mac table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"global table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"func table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"port table\n" ); +return 0 ; +} + +static const struct hinic_dbg_cmd_info g_hinic_dbg_cmd[] = { + {"help" , hinic_dbg_help}, + {"sq info" , hinic_dbg_get_sq_info},
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c line 1266
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c new file +10
-0+ {"sq wqe info", hinic_dbg_get_sq_wqe_info}, + {"rq info", hinic_dbg_get_rq_info}, + {"rq wqe info", hinic_dbg_get_rq_wqe_info}, + {"sq ci table", hinic_dbg_get_ci_table}, + {"rq cqe info", hinic_dbg_get_rq_cqe_info}, + {"mac table", hinic_dbg_get_mac_table}, + {"global table", hinic_dbg_get_global_table}, + {"func table", hinic_dbg_get_function_table}, + {"port table", hinic_dbg_get_port_table}, +};
Please don't create command interfaces like this.
Instead create a read only file for objects you want to expose.
Split addition of each object into a separate patch and provide example output in the commit message.
Quoted 33 lines · Jakub Kicinski
Quoted 19 lines · On Thu, 20 Aug 2020 20:14:32 +0800 Luo bin wrote:
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c new file +19
-0+static int hinic_dbg_help (struct hinic_dev *nic_dev,const char *cmd_buf) +{ +netif_info (nic_dev, drv, nic_dev->netdev,"Available commands:\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq info <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq wqe info <queue id> <wqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq info <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq wqe info <queue id> <wqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"sq ci table <queue id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"rq cqe info <queue id> <cqe id>\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"mac table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"global table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"func table\n" ); +netif_info (nic_dev, drv, nic_dev->netdev,"port table\n" ); +return 0 ; +} + +static const struct hinic_dbg_cmd_info g_hinic_dbg_cmd[] = { + {"help" , hinic_dbg_help}, + {"sq info" , hinic_dbg_get_sq_info},drivers/net/ethernet/huawei/hinic/hinic_debugfs.c line 1266
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c new file +10
-0+ {"sq wqe info", hinic_dbg_get_sq_wqe_info}, + {"rq info", hinic_dbg_get_rq_info}, + {"rq wqe info", hinic_dbg_get_rq_wqe_info}, + {"sq ci table", hinic_dbg_get_ci_table}, + {"rq cqe info", hinic_dbg_get_rq_cqe_info}, + {"mac table", hinic_dbg_get_mac_table}, + {"global table", hinic_dbg_get_global_table}, + {"func table", hinic_dbg_get_function_table}, + {"port table", hinic_dbg_get_port_table}, +};Please don't create command interfaces like this.
Quoted 6 lines
Instead create a read only file for objects you want to expose.
Split addition of each object into a separate patch and provide example output in the commit message.
.
Will fix. Thanks for your review.