fbnic: Expand mac stats coverage
Subsystems (4)
cover fbnic: Expand mac stats coverage
This patch series expand the coverage of mac stats for fbnic. The first patch increment the ETHTOOL_RMON_HIST_MAX by 1 to provide necessary support for all the ranges of rmon histogram supported by fbnic. The second patch add support for rmon and eth_ctrl stats.
Mohsin Bashir (2):
eth: Update rmon hist range
eth: fbnic: Expand coverage of mac stats
drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 112 ++++++++++++++++++ .../net/ethernet/meta/fbnic/fbnic_ethtool.c | 66 +++++++++++ .../net/ethernet/meta/fbnic/fbnic_hw_stats.h | 19 +++ drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 72 +++++++++++ drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 4 + include/linux/ethtool.h | 2 +- 6 files changed, 274 insertions(+), 1 deletion(-)
Signature · 1 line
2.47.1
PATCH 1/2 eth: Update rmon hist range
The fbnic driver reports up-to 11 ranges resulting in the drop of the last range. This patch increment the value of ETHTOOL_RMON_HIST_MAX to address this limitation.
--- include/linux/ethtool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ethtool.h +1 -1
@@ -536,7 +536,7 @@ struct ethtool_rmon_hist_range {u16 high; }; -#define ETHTOOL_RMON_HIST_MAX 10 +#define ETHTOOL_RMON_HIST_MAX 11/** * struct ethtool_rmon_stats - selected RMON (RFC 2819) statistics
Signature · 1 line
2.47.1
Re: [PATCH net-next 1/2] eth: Update rmon hist range
Quoted 15 lines · Mohsin Bashir
The fbnic driver reports up-to 11 ranges resulting in the drop of the last range. This patch increment the value of
ETHTOOL_RMON_HIST_MAXto address this limitation.Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Mohsin Bashir <[email protected]>--- include/linux/ethtool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/ethtool.h +0
-0
include/linux/ethtool.h struct ethtool_rmon_hist_range { · line 540
Quoted 6 lines
include/linux/ethtool.h +1
-1@@ -536,7 +536,7 @@ struct ethtool_rmon_hist_range {u16 high; }; -#define ETHTOOL_RMON_HIST_MAX 10 +#define ETHTOOL_RMON_HIST_MAX 11
Re: [PATCH net-next 1/2] eth: Update rmon hist range
In reply to Mohsin BashirQuoted 6 lines · Mohsin Bashir
The fbnic driver reports up-to 11 ranges resulting in the drop of the last range. This patch increment the value of
ETHTOOL_RMON_HIST_MAXto address this limitation.Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Mohsin Bashir <[email protected]>
Andrew
PATCH 2/2 eth: fbnic: Expand coverage of mac stats
In reply to Mohsin BashirExpand coverage of MAC stats via ethtool by adding rmon and eth-ctrl stats.
ethtool -S eth0 --groups eth-ctrl
Standard stats for eth0:
eth-ctrl-MACControlFramesTransmitted: 0
eth-ctrl-MACControlFramesReceived: 0
ethtool -S eth0 --groups rmon
Standard stats for eth0:
rmon-etherStatsUndersizePkts: 0
rmon-etherStatsOversizePkts: 0
rmon-etherStatsFragments: 0
rmon-etherStatsJabbers: 0
rx-rmon-etherStatsPkts64Octets: 32807689
rx-rmon-etherStatsPkts65to127Octets: 567512968
rx-rmon-etherStatsPkts128to255Octets: 64730266
rx-rmon-etherStatsPkts256to511Octets: 20136039
rx-rmon-etherStatsPkts512to1023Octets: 28476870
rx-rmon-etherStatsPkts1024to1518Octets: 6958335
rx-rmon-etherStatsPkts1519to2047Octets: 164
rx-rmon-etherStatsPkts2048to4095Octets: 3844
rx-rmon-etherStatsPkts4096to8191Octets: 21814
rx-rmon-etherStatsPkts8192to9216Octets: 6540818
rx-rmon-etherStatsPkts9217to9742Octets: 4180897
tx-rmon-etherStatsPkts64Octets: 8786
tx-rmon-etherStatsPkts65to127Octets: 31475804
tx-rmon-etherStatsPkts128to255Octets: 3581331
tx-rmon-etherStatsPkts256to511Octets: 2483038
tx-rmon-etherStatsPkts512to1023Octets: 4500916
tx-rmon-etherStatsPkts1024to1518Octets: 38741270
tx-rmon-etherStatsPkts1519to2047Octets: 15521
tx-rmon-etherStatsPkts2048to4095Octets: 4109
tx-rmon-etherStatsPkts4096to8191Octets: 20817
tx-rmon-etherStatsPkts8192to9216Octets: 6904055
tx-rmon-etherStatsPkts9217to9742Octets: 6757746
--- drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 112 ++++++++++++++++++ .../net/ethernet/meta/fbnic/fbnic_ethtool.c | 66 +++++++++++ .../net/ethernet/meta/fbnic/fbnic_hw_stats.h | 19 +++ drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 72 +++++++++++ drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 4 + 5 files changed, 273 insertions(+)
drivers/net/ethernet/meta/fbnic/fbnic_csr.h +112 -0
@@ -446,6 +446,26 @@ enum {#define FBNIC_TMI_ILLEGAL_PTP_REQS 0x04409/* 0x11024 */ #define FBNIC_TMI_GOOD_PTP_TS 0x0440a/* 0x11028 */ #define FBNIC_TMI_BAD_PTP_TS 0x0440b/* 0x1102c */ +#define FBNIC_TMI_STAT_TX_PACKET_1519_2047_BYTES_L \ + 0x04433/* 0x110cc */ +#define FBNIC_TMI_STAT_TX_PACKET_1519_2047_BYTES_H \ + 0x04434/* 0x110d0 */ +#define FBNIC_TMI_STAT_TX_PACKET_2048_4095_BYTES_L \ + 0x04435/* 0x110d4 */ +#define FBNIC_TMI_STAT_TX_PACKET_2048_4095_BYTES_H \ + 0x04436/* 0x110d8 */ +#define FBNIC_TMI_STAT_TX_PACKET_4096_8191_BYTES_L \ + 0x04437/* 0x110dc */ +#define FBNIC_TMI_STAT_TX_PACKET_4096_8191_BYTES_H \ + 0x04438/* 0x110e0 */ +#define FBNIC_TMI_STAT_TX_PACKET_8192_9216_BYTES_L \ + 0x04439/* 0x110e4 */ +#define FBNIC_TMI_STAT_TX_PACKET_8192_9216_BYTES_H \ + 0x0443a/* 0x110e8 */ +#define FBNIC_TMI_STAT_TX_PACKET_9217_MAX_BYTES_L \ + 0x0443b/* 0x110ec */ +#define FBNIC_TMI_STAT_TX_PACKET_9217_MAX_BYTES_H \ + 0x0443c/* 0x110f0 */ #define FBNIC_CSR_END_TMI 0x0443f/* CSR section delimiter */ /* Precision Time Protocol Registers */
@@ -674,6 +694,26 @@ enum {#define FBNIC_RPC_CNTR_OVR_SIZE_ERR 0x084a6/* 0x21298 */ #define FBNIC_RPC_TCAM_MACDA_VALIDATE 0x0852d/* 0x214b4 */ +#define FBNIC_RPC_STAT_RX_PACKET_1519_2047_BYTES_L \ + 0x0855f/* 0x2157c */ +#define FBNIC_RPC_STAT_RX_PACKET_1519_2047_BYTES_H \ + 0x08560/* 0x21580 */ +#define FBNIC_RPC_STAT_RX_PACKET_2048_4095_BYTES_L \ + 0x08561/* 0x21584 */ +#define FBNIC_RPC_STAT_RX_PACKET_2048_4095_BYTES_H \ + 0x08562/* 0x21588 */ +#define FBNIC_RPC_STAT_RX_PACKET_4096_8191_BYTES_L \ + 0x08563/* 0x2158c */ +#define FBNIC_RPC_STAT_RX_PACKET_4096_8191_BYTES_H \ + 0x08564/* 0x21590 */ +#define FBNIC_RPC_STAT_RX_PACKET_8192_9216_BYTES_L \ + 0x08565/* 0x21594 */ +#define FBNIC_RPC_STAT_RX_PACKET_8192_9216_BYTES_H \ + 0x08566/* 0x21598 */ +#define FBNIC_RPC_STAT_RX_PACKET_9217_MAX_BYTES_L \ + 0x08567/* 0x2159c */ +#define FBNIC_RPC_STAT_RX_PACKET_9217_MAX_BYTES_H \ + 0x08568/* 0x215a0 */ #define FBNIC_CSR_END_RPC 0x0856b/* CSR section delimiter */ /* RPC RAM Registers */
@@ -796,6 +836,46 @@ enum {#define FBNIC_MAC_STAT_RX_MULTICAST_H 0x11a1d/* 0x46874 */ #define FBNIC_MAC_STAT_RX_BROADCAST_L 0x11a1e/* 0x46878 */ #define FBNIC_MAC_STAT_RX_BROADCAST_H 0x11a1f/* 0x4687c */ +#define FBNIC_MAC_STAT_RX_UNDERSIZE_L 0x11a24/* 0x46890 */ +#define FBNIC_MAC_STAT_RX_UNDERSIZE_H 0x11a25/* 0x46894 */ +#define FBNIC_MAC_STAT_RX_PACKET_64_BYTES_L \ + 0x11a26/* 0x46898 */ +#define FBNIC_MAC_STAT_RX_PACKET_64_BYTES_H \ + 0x11a27/* 0x4689c */ +#define FBNIC_MAC_STAT_RX_PACKET_65_127_BYTES_L \ + 0x11a28/* 0x468a0 */ +#define FBNIC_MAC_STAT_RX_PACKET_65_127_BYTES_H \ + 0x11a29/* 0x468a4 */ +#define FBNIC_MAC_STAT_RX_PACKET_128_255_BYTES_L \ + 0x11a2a/* 0x468a8 */ +#define FBNIC_MAC_STAT_RX_PACKET_128_255_BYTES_H \ + 0x11a2b/* 0x468ac */ +#define FBNIC_MAC_STAT_RX_PACKET_256_511_BYTES_L \ + 0x11a2c/* 0x468b0 */ +#define FBNIC_MAC_STAT_RX_PACKET_256_511_BYTES_H \ + 0x11a2d/* 0x468b4 */ +#define FBNIC_MAC_STAT_RX_PACKET_512_1023_BYTES_L \ + 0x11a2e/* 0x468b8 */ +#define FBNIC_MAC_STAT_RX_PACKET_512_1023_BYTES_H \ + 0x11a2f/* 0x468bc */ +#define FBNIC_MAC_STAT_RX_PACKET_1024_1518_BYTES_L \ + 0x11a30/* 0x468c0 */ +#define FBNIC_MAC_STAT_RX_PACKET_1024_1518_BYTES_H \ + 0x11a31/* 0x468c4 */ +#define FBNIC_MAC_STAT_RX_PACKET_1519_MAX_BYTES_L \ + 0x11a32/* 0x468c8 */ +#define FBNIC_MAC_STAT_RX_PACKET_1519_MAX_BYTES_H \ + 0x11a33/* 0x468cc */ +#define FBNIC_MAC_STAT_RX_OVERSIZE_L 0x11a34/* 0x468d0 */ +#define FBNIC_MAC_STAT_RX_OVERSSIZE_H 0x11a35/* 0x468d4 */ +#define FBNIC_MAC_STAT_RX_JABBER_L 0x11a36/* 0x468d8 */ +#define FBNIC_MAC_STAT_RX_JABBER_H 0x11a37/* 0x468dc */ +#define FBNIC_MAC_STAT_RX_FRAGMENT_L 0x11a38/* 0x468e0 */ +#define FBNIC_MAC_STAT_RX_FRAGMENT_H 0x11a39/* 0x468e4 */ +#define FBNIC_MAC_STAT_RX_CONTROL_FRAMES_L \ + 0x11a3c/* 0x468f0 */ +#define FBNIC_MAC_STAT_RX_CONTROL_FRAMES_H \ + 0x11a3d/* 0x468f4 */ #define FBNIC_MAC_STAT_TX_BYTE_COUNT_L 0x11a3e/* 0x468f8 */ #define FBNIC_MAC_STAT_TX_BYTE_COUNT_H 0x11a3f/* 0x468fc */ #define FBNIC_MAC_STAT_TX_TRANSMITTED_OK_L \
@@ -810,6 +890,38 @@ enum {#define FBNIC_MAC_STAT_TX_MULTICAST_H 0x11a4b/* 0x4692c */ #define FBNIC_MAC_STAT_TX_BROADCAST_L 0x11a4c/* 0x46930 */ #define FBNIC_MAC_STAT_TX_BROADCAST_H 0x11a4d/* 0x46934 */ +#define FBNIC_MAC_STAT_TX_PACKET_64_BYTES_L \ + 0x11a4e/* 0x46938 */ +#define FBNIC_MAC_STAT_TX_PACKET_64_BYTES_H \ + 0x11a4f/* 0x4693c */ +#define FBNIC_MAC_STAT_TX_PACKET_65_127_BYTES_L \ + 0x11a50/* 0x46940 */ +#define FBNIC_MAC_STAT_TX_PACKET_65_127_BYTES_H \ + 0x11a51/* 0x46944 */ +#define FBNIC_MAC_STAT_TX_PACKET_128_255_BYTES_L \ + 0x11a52/* 0x46948 */ +#define FBNIC_MAC_STAT_TX_PACKET_128_255_BYTES_H \ + 0x11a53/* 0x4694c */ +#define FBNIC_MAC_STAT_TX_PACKET_256_511_BYTES_L \ + 0x11a54/* 0x46950 */ +#define FBNIC_MAC_STAT_TX_PACKET_256_511_BYTES_H \ + 0x11a55/* 0x46954 */ +#define FBNIC_MAC_STAT_TX_PACKET_512_1023_BYTES_L \ + 0x11a56/* 0x46958 */ +#define FBNIC_MAC_STAT_TX_PACKET_512_1023_BYTES_H \ + 0x11a57/* 0x4695c */ +#define FBNIC_MAC_STAT_TX_PACKET_1024_1518_BYTES_L \ + 0x11a58/* 0x46960 */ +#define FBNIC_MAC_STAT_TX_PACKET_1024_1518_BYTES_H \ + 0x11a59/* 0x46964 */ +#define FBNIC_MAC_STAT_TX_PACKET_1519_MAX_BYTES_L \ + 0x11a5a/* 0x46968 */ +#define FBNIC_MAC_STAT_TX_PACKET_1519_MAX_BYTES_H \ + 0x11a5b/* 0x4696c */ +#define FBNIC_MAC_STAT_TX_CONTROL_FRAMES_L \ + 0x11a5e/* 0x46978 */ +#define FBNIC_MAC_STAT_TX_CONTROL_FRAMES_H \ + 0x11a5f/* 0x4697c */ /* PCIE Comphy Registers */ #define FBNIC_CSR_START_PCIE_SS_COMPHY 0x2442e/* CSR section delimiter */
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c +66 -0
78 lines not on this page · raw message
drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h +19 -0
@@ -22,6 +22,23 @@ struct fbnic_hw_stat {struct fbnic_stat_counter bytes; }; +/* Note: not updated by fbnic_get_hw_stats() */ +struct fbnic_eth_ctrl_stats { +struct fbnic_stat_counter MACControlFramesTransmitted; +struct fbnic_stat_counter MACControlFramesReceived; +}; + +/* Note: not updated by fbnic_get_hw_stats() */ +struct fbnic_rmon_stats { +struct fbnic_stat_counter undersize_pkts; +struct fbnic_stat_counter oversize_pkts; +struct fbnic_stat_counter fragments; +struct fbnic_stat_counter jabbers; + +struct fbnic_stat_counter hist[ETHTOOL_RMON_HIST_MAX ]; +struct fbnic_stat_counter hist_tx[ETHTOOL_RMON_HIST_MAX ]; +}; +struct fbnic_eth_mac_stats {struct fbnic_stat_counter FramesTransmittedOK;struct fbnic_stat_counter FramesReceivedOK;
@@ -40,6 +57,8 @@ struct fbnic_eth_mac_stats {struct fbnic_mac_stats {struct fbnic_eth_mac_stats eth_mac; +struct fbnic_eth_ctrl_stats eth_ctrl; +struct fbnic_rmon_stats rmon; };struct fbnic_tmi_stats {
drivers/net/ethernet/meta/fbnic/fbnic_mac.c +72 -0
84 lines not on this page · raw message
drivers/net/ethernet/meta/fbnic/fbnic_mac.h +4 -0
@@ -85,6 +85,10 @@ struct fbnic_mac {void (*get_eth_mac_stats)(struct fbnic_dev *fbd,bool reset,struct fbnic_eth_mac_stats *mac_stats); +void (*get_eth_ctrl_stats)(struct fbnic_dev *fbd,bool reset, +struct fbnic_eth_ctrl_stats *ctrl_stats); +void (*get_rmon_stats)(struct fbnic_dev *fbd,bool reset, +struct fbnic_rmon_stats *rmon_stats);void (*link_down)(struct fbnic_dev *fbd);void (*link_up)(struct fbnic_dev *fbd,bool tx_pause,bool rx_pause);
Signature · 1 line
2.47.1
Re: [PATCH net-next 2/2] eth: fbnic: Expand coverage of mac stats
Quoted 37 lines · Mohsin Bashir
Expand coverage of MAC stats via ethtool by adding rmon and eth-ctrl stats.
ethtool -S eth0 --groups eth-ctrl
Standard stats for eth0:
eth-ctrl-MACControlFramesTransmitted: 0
eth-ctrl-MACControlFramesReceived: 0ethtool -S eth0 --groups rmon
Standard stats for eth0:
rmon-etherStatsUndersizePkts: 0
rmon-etherStatsOversizePkts: 0
rmon-etherStatsFragments: 0
rmon-etherStatsJabbers: 0
rx-rmon-etherStatsPkts64Octets: 32807689
rx-rmon-etherStatsPkts65to127Octets: 567512968
rx-rmon-etherStatsPkts128to255Octets: 64730266
rx-rmon-etherStatsPkts256to511Octets: 20136039
rx-rmon-etherStatsPkts512to1023Octets: 28476870
rx-rmon-etherStatsPkts1024to1518Octets: 6958335
rx-rmon-etherStatsPkts1519to2047Octets: 164
rx-rmon-etherStatsPkts2048to4095Octets: 3844
rx-rmon-etherStatsPkts4096to8191Octets: 21814
rx-rmon-etherStatsPkts8192to9216Octets: 6540818
rx-rmon-etherStatsPkts9217to9742Octets: 4180897
tx-rmon-etherStatsPkts64Octets: 8786
tx-rmon-etherStatsPkts65to127Octets: 31475804
tx-rmon-etherStatsPkts128to255Octets: 3581331
tx-rmon-etherStatsPkts256to511Octets: 2483038
tx-rmon-etherStatsPkts512to1023Octets: 4500916
tx-rmon-etherStatsPkts1024to1518Octets: 38741270
tx-rmon-etherStatsPkts1519to2047Octets: 15521
tx-rmon-etherStatsPkts2048to4095Octets: 4109
tx-rmon-etherStatsPkts4096to8191Octets: 20817
tx-rmon-etherStatsPkts8192to9216Octets: 6904055
tx-rmon-etherStatsPkts9217to9742Octets: 6757746
Quoted 3 lines
Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Mohsin Bashir <[email protected]>---
Re: [PATCH net-next 2/2] eth: fbnic: Expand coverage of mac stats
In reply to Mohsin BashirQuoted 37 lines · Mohsin Bashir
Expand coverage of MAC stats via ethtool by adding rmon and eth-ctrl stats.
ethtool -S eth0 --groups eth-ctrl
Standard stats for eth0:
eth-ctrl-MACControlFramesTransmitted: 0
eth-ctrl-MACControlFramesReceived: 0ethtool -S eth0 --groups rmon
Standard stats for eth0:
rmon-etherStatsUndersizePkts: 0
rmon-etherStatsOversizePkts: 0
rmon-etherStatsFragments: 0
rmon-etherStatsJabbers: 0
rx-rmon-etherStatsPkts64Octets: 32807689
rx-rmon-etherStatsPkts65to127Octets: 567512968
rx-rmon-etherStatsPkts128to255Octets: 64730266
rx-rmon-etherStatsPkts256to511Octets: 20136039
rx-rmon-etherStatsPkts512to1023Octets: 28476870
rx-rmon-etherStatsPkts1024to1518Octets: 6958335
rx-rmon-etherStatsPkts1519to2047Octets: 164
rx-rmon-etherStatsPkts2048to4095Octets: 3844
rx-rmon-etherStatsPkts4096to8191Octets: 21814
rx-rmon-etherStatsPkts8192to9216Octets: 6540818
rx-rmon-etherStatsPkts9217to9742Octets: 4180897
tx-rmon-etherStatsPkts64Octets: 8786
tx-rmon-etherStatsPkts65to127Octets: 31475804
tx-rmon-etherStatsPkts128to255Octets: 3581331
tx-rmon-etherStatsPkts256to511Octets: 2483038
tx-rmon-etherStatsPkts512to1023Octets: 4500916
tx-rmon-etherStatsPkts1024to1518Octets: 38741270
tx-rmon-etherStatsPkts1519to2047Octets: 15521
tx-rmon-etherStatsPkts2048to4095Octets: 4109
tx-rmon-etherStatsPkts4096to8191Octets: 20817
tx-rmon-etherStatsPkts8192to9216Octets: 6904055
tx-rmon-etherStatsPkts9217to9742Octets: 6757746
Quoted 2 lines
Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Mohsin Bashir <[email protected]>
Andrew
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 10 Jun 2025 10:11:07 -0700 you wrote:
This patch series expand the coverage of mac stats for fbnic. The first patch increment the
ETHTOOL_RMON_HIST_MAXby 1 to provide necessary support for all the ranges of rmon histogram supported by fbnic. The second patch add support for rmon andeth_ctrlstats.Mohsin Bashir (2):
eth: Update rmon hist range
eth: fbnic: Expand coverage of mac stats[...]
Here is the summary with links:
- [net-next,1/2] eth: Update rmon hist range
https://git.kernel.org/netdev/net-next/c/e1f4b1f16758 - [net-next,2/2] eth: fbnic: Expand coverage of mac stats https://git.kernel.org/netdev/net-next/c/6913e873e7b2
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html