Skip to content

Commit 46b92e1

Browse files
Jiawen Wukuba-moo
Jiawen Wu
authored and
kuba-moo
committed
net: libwx: support hardware statistics
Implement update and clear Rx/Tx statistics. Signed-off-by: Jiawen Wu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e3bbab4 commit 46b92e1

File tree

6 files changed

+377
-2
lines changed

6 files changed

+377
-2
lines changed

‎drivers/net/ethernet/wangxun/libwx/wx_ethtool.c‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,171 @@
33

44
#include <linux/pci.h>
55
#include <linux/phy.h>
6+
#include <linux/ethtool.h>
67

78
#include "wx_type.h"
89
#include "wx_ethtool.h"
10+
#include "wx_hw.h"
11+
12+
struct wx_stats {
13+
char stat_string[ETH_GSTRING_LEN];
14+
size_t sizeof_stat;
15+
off_t stat_offset;
16+
};
17+
18+
#define WX_STAT(str, m) { \
19+
.stat_string = str, \
20+
.sizeof_stat = sizeof(((struct wx *)0)->m), \
21+
.stat_offset = offsetof(struct wx, m) }
22+
23+
static const struct wx_stats wx_gstrings_stats[] = {
24+
WX_STAT("rx_dma_pkts", stats.gprc),
25+
WX_STAT("tx_dma_pkts", stats.gptc),
26+
WX_STAT("rx_dma_bytes", stats.gorc),
27+
WX_STAT("tx_dma_bytes", stats.gotc),
28+
WX_STAT("rx_total_pkts", stats.tpr),
29+
WX_STAT("tx_total_pkts", stats.tpt),
30+
WX_STAT("rx_long_length_count", stats.roc),
31+
WX_STAT("rx_short_length_count", stats.ruc),
32+
WX_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),
33+
WX_STAT("os2bmc_tx_by_bmc", stats.b2ospc),
34+
WX_STAT("os2bmc_tx_by_host", stats.o2bspc),
35+
WX_STAT("os2bmc_rx_by_host", stats.b2ogprc),
36+
WX_STAT("rx_no_dma_resources", stats.rdmdrop),
37+
WX_STAT("tx_busy", tx_busy),
38+
WX_STAT("non_eop_descs", non_eop_descs),
39+
WX_STAT("tx_restart_queue", restart_queue),
40+
WX_STAT("rx_csum_offload_good_count", hw_csum_rx_good),
41+
WX_STAT("rx_csum_offload_errors", hw_csum_rx_error),
42+
WX_STAT("alloc_rx_buff_failed", alloc_rx_buff_failed),
43+
};
44+
45+
/* drivers allocates num_tx_queues and num_rx_queues symmetrically so
46+
* we set the num_rx_queues to evaluate to num_tx_queues. This is
47+
* used because we do not have a good way to get the max number of
48+
* rx queues with CONFIG_RPS disabled.
49+
*/
50+
#define WX_NUM_RX_QUEUES netdev->num_tx_queues
51+
#define WX_NUM_TX_QUEUES netdev->num_tx_queues
52+
53+
#define WX_QUEUE_STATS_LEN ( \
54+
(WX_NUM_TX_QUEUES + WX_NUM_RX_QUEUES) * \
55+
(sizeof(struct wx_queue_stats) / sizeof(u64)))
56+
#define WX_GLOBAL_STATS_LEN ARRAY_SIZE(wx_gstrings_stats)
57+
#define WX_STATS_LEN (WX_GLOBAL_STATS_LEN + WX_QUEUE_STATS_LEN)
58+
59+
int wx_get_sset_count(struct net_device *netdev, int sset)
60+
{
61+
switch (sset) {
62+
case ETH_SS_STATS:
63+
return WX_STATS_LEN;
64+
default:
65+
return -EOPNOTSUPP;
66+
}
67+
}
68+
EXPORT_SYMBOL(wx_get_sset_count);
69+
70+
void wx_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
71+
{
72+
u8 *p = data;
73+
int i;
74+
75+
switch (stringset) {
76+
case ETH_SS_STATS:
77+
for (i = 0; i < WX_GLOBAL_STATS_LEN; i++)
78+
ethtool_sprintf(&p, wx_gstrings_stats[i].stat_string);
79+
for (i = 0; i < netdev->num_tx_queues; i++) {
80+
ethtool_sprintf(&p, "tx_queue_%u_packets", i);
81+
ethtool_sprintf(&p, "tx_queue_%u_bytes", i);
82+
}
83+
for (i = 0; i < WX_NUM_RX_QUEUES; i++) {
84+
ethtool_sprintf(&p, "rx_queue_%u_packets", i);
85+
ethtool_sprintf(&p, "rx_queue_%u_bytes", i);
86+
}
87+
break;
88+
}
89+
}
90+
EXPORT_SYMBOL(wx_get_strings);
91+
92+
void wx_get_ethtool_stats(struct net_device *netdev,
93+
struct ethtool_stats *stats, u64 *data)
94+
{
95+
struct wx *wx = netdev_priv(netdev);
96+
struct wx_ring *ring;
97+
unsigned int start;
98+
int i, j;
99+
char *p;
100+
101+
wx_update_stats(wx);
102+
103+
for (i = 0; i < WX_GLOBAL_STATS_LEN; i++) {
104+
p = (char *)wx + wx_gstrings_stats[i].stat_offset;
105+
data[i] = (wx_gstrings_stats[i].sizeof_stat ==
106+
sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
107+
}
108+
109+
for (j = 0; j < netdev->num_tx_queues; j++) {
110+
ring = wx->tx_ring[j];
111+
if (!ring) {
112+
data[i++] = 0;
113+
data[i++] = 0;
114+
continue;
115+
}
116+
117+
do {
118+
start = u64_stats_fetch_begin(&ring->syncp);
119+
data[i] = ring->stats.packets;
120+
data[i + 1] = ring->stats.bytes;
121+
} while (u64_stats_fetch_retry(&ring->syncp, start));
122+
i += 2;
123+
}
124+
for (j = 0; j < WX_NUM_RX_QUEUES; j++) {
125+
ring = wx->rx_ring[j];
126+
if (!ring) {
127+
data[i++] = 0;
128+
data[i++] = 0;
129+
continue;
130+
}
131+
132+
do {
133+
start = u64_stats_fetch_begin(&ring->syncp);
134+
data[i] = ring->stats.packets;
135+
data[i + 1] = ring->stats.bytes;
136+
} while (u64_stats_fetch_retry(&ring->syncp, start));
137+
i += 2;
138+
}
139+
}
140+
EXPORT_SYMBOL(wx_get_ethtool_stats);
141+
142+
void wx_get_mac_stats(struct net_device *netdev,
143+
struct ethtool_eth_mac_stats *mac_stats)
144+
{
145+
struct wx *wx = netdev_priv(netdev);
146+
struct wx_hw_stats *hwstats;
147+
148+
wx_update_stats(wx);
149+
150+
hwstats = &wx->stats;
151+
mac_stats->MulticastFramesXmittedOK = hwstats->mptc;
152+
mac_stats->BroadcastFramesXmittedOK = hwstats->bptc;
153+
mac_stats->MulticastFramesReceivedOK = hwstats->mprc;
154+
mac_stats->BroadcastFramesReceivedOK = hwstats->bprc;
155+
}
156+
EXPORT_SYMBOL(wx_get_mac_stats);
157+
158+
void wx_get_pause_stats(struct net_device *netdev,
159+
struct ethtool_pause_stats *stats)
160+
{
161+
struct wx *wx = netdev_priv(netdev);
162+
struct wx_hw_stats *hwstats;
163+
164+
wx_update_stats(wx);
165+
166+
hwstats = &wx->stats;
167+
stats->tx_pause_frames = hwstats->lxontxc + hwstats->lxofftxc;
168+
stats->rx_pause_frames = hwstats->lxonoffrxc;
169+
}
170+
EXPORT_SYMBOL(wx_get_pause_stats);
9171

10172
void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
11173
{
@@ -14,5 +176,12 @@ void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
14176
strscpy(info->driver, wx->driver_name, sizeof(info->driver));
15177
strscpy(info->fw_version, wx->eeprom_id, sizeof(info->fw_version));
16178
strscpy(info->bus_info, pci_name(wx->pdev), sizeof(info->bus_info));
179+
if (wx->num_tx_queues <= WX_NUM_TX_QUEUES) {
180+
info->n_stats = WX_STATS_LEN -
181+
(WX_NUM_TX_QUEUES - wx->num_tx_queues) *
182+
(sizeof(struct wx_queue_stats) / sizeof(u64)) * 2;
183+
} else {
184+
info->n_stats = WX_STATS_LEN;
185+
}
17186
}
18187
EXPORT_SYMBOL(wx_get_drvinfo);

‎drivers/net/ethernet/wangxun/libwx/wx_ethtool.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,13 @@
44
#ifndef _WX_ETHTOOL_H_
55
#define _WX_ETHTOOL_H_
66

7+
int wx_get_sset_count(struct net_device *netdev, int sset);
8+
void wx_get_strings(struct net_device *netdev, u32 stringset, u8 *data);
9+
void wx_get_ethtool_stats(struct net_device *netdev,
10+
struct ethtool_stats *stats, u64 *data);
11+
void wx_get_mac_stats(struct net_device *netdev,
12+
struct ethtool_eth_mac_stats *mac_stats);
13+
void wx_get_pause_stats(struct net_device *netdev,
14+
struct ethtool_pause_stats *stats);
715
void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info);
816
#endif /* _WX_ETHTOOL_H_ */

‎drivers/net/ethernet/wangxun/libwx/wx_hw.c‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,6 +2001,105 @@ int wx_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
20012001
}
20022002
EXPORT_SYMBOL(wx_vlan_rx_kill_vid);
20032003

2004+
/**
2005+
* wx_update_stats - Update the board statistics counters.
2006+
* @wx: board private structure
2007+
**/
2008+
void wx_update_stats(struct wx *wx)
2009+
{
2010+
struct wx_hw_stats *hwstats = &wx->stats;
2011+
2012+
u64 non_eop_descs = 0, alloc_rx_buff_failed = 0;
2013+
u64 hw_csum_rx_good = 0, hw_csum_rx_error = 0;
2014+
u64 restart_queue = 0, tx_busy = 0;
2015+
u32 i;
2016+
2017+
/* gather some stats to the wx struct that are per queue */
2018+
for (i = 0; i < wx->num_rx_queues; i++) {
2019+
struct wx_ring *rx_ring = wx->rx_ring[i];
2020+
2021+
non_eop_descs += rx_ring->rx_stats.non_eop_descs;
2022+
alloc_rx_buff_failed += rx_ring->rx_stats.alloc_rx_buff_failed;
2023+
hw_csum_rx_good += rx_ring->rx_stats.csum_good_cnt;
2024+
hw_csum_rx_error += rx_ring->rx_stats.csum_err;
2025+
}
2026+
wx->non_eop_descs = non_eop_descs;
2027+
wx->alloc_rx_buff_failed = alloc_rx_buff_failed;
2028+
wx->hw_csum_rx_error = hw_csum_rx_error;
2029+
wx->hw_csum_rx_good = hw_csum_rx_good;
2030+
2031+
for (i = 0; i < wx->num_tx_queues; i++) {
2032+
struct wx_ring *tx_ring = wx->tx_ring[i];
2033+
2034+
restart_queue += tx_ring->tx_stats.restart_queue;
2035+
tx_busy += tx_ring->tx_stats.tx_busy;
2036+
}
2037+
wx->restart_queue = restart_queue;
2038+
wx->tx_busy = tx_busy;
2039+
2040+
hwstats->gprc += rd32(wx, WX_RDM_PKT_CNT);
2041+
hwstats->gptc += rd32(wx, WX_TDM_PKT_CNT);
2042+
hwstats->gorc += rd64(wx, WX_RDM_BYTE_CNT_LSB);
2043+
hwstats->gotc += rd64(wx, WX_TDM_BYTE_CNT_LSB);
2044+
hwstats->tpr += rd64(wx, WX_RX_FRAME_CNT_GOOD_BAD_L);
2045+
hwstats->tpt += rd64(wx, WX_TX_FRAME_CNT_GOOD_BAD_L);
2046+
hwstats->crcerrs += rd64(wx, WX_RX_CRC_ERROR_FRAMES_L);
2047+
hwstats->rlec += rd64(wx, WX_RX_LEN_ERROR_FRAMES_L);
2048+
hwstats->bprc += rd64(wx, WX_RX_BC_FRAMES_GOOD_L);
2049+
hwstats->bptc += rd64(wx, WX_TX_BC_FRAMES_GOOD_L);
2050+
hwstats->mprc += rd64(wx, WX_RX_MC_FRAMES_GOOD_L);
2051+
hwstats->mptc += rd64(wx, WX_TX_MC_FRAMES_GOOD_L);
2052+
hwstats->roc += rd32(wx, WX_RX_OVERSIZE_FRAMES_GOOD);
2053+
hwstats->ruc += rd32(wx, WX_RX_UNDERSIZE_FRAMES_GOOD);
2054+
hwstats->lxonoffrxc += rd32(wx, WX_MAC_LXONOFFRXC);
2055+
hwstats->lxontxc += rd32(wx, WX_RDB_LXONTXC);
2056+
hwstats->lxofftxc += rd32(wx, WX_RDB_LXOFFTXC);
2057+
hwstats->o2bgptc += rd32(wx, WX_TDM_OS2BMC_CNT);
2058+
hwstats->b2ospc += rd32(wx, WX_MNG_BMC2OS_CNT);
2059+
hwstats->o2bspc += rd32(wx, WX_MNG_OS2BMC_CNT);
2060+
hwstats->b2ogprc += rd32(wx, WX_RDM_BMC2OS_CNT);
2061+
hwstats->rdmdrop += rd32(wx, WX_RDM_DRP_PKT);
2062+
2063+
for (i = 0; i < wx->mac.max_rx_queues; i++)
2064+
hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));
2065+
}
2066+
EXPORT_SYMBOL(wx_update_stats);
2067+
2068+
/**
2069+
* wx_clear_hw_cntrs - Generic clear hardware counters
2070+
* @wx: board private structure
2071+
*
2072+
* Clears all hardware statistics counters by reading them from the hardware
2073+
* Statistics counters are clear on read.
2074+
**/
2075+
void wx_clear_hw_cntrs(struct wx *wx)
2076+
{
2077+
u16 i = 0;
2078+
2079+
for (i = 0; i < wx->mac.max_rx_queues; i++)
2080+
wr32(wx, WX_PX_MPRC(i), 0);
2081+
2082+
rd32(wx, WX_RDM_PKT_CNT);
2083+
rd32(wx, WX_TDM_PKT_CNT);
2084+
rd64(wx, WX_RDM_BYTE_CNT_LSB);
2085+
rd32(wx, WX_TDM_BYTE_CNT_LSB);
2086+
rd32(wx, WX_RDM_DRP_PKT);
2087+
rd32(wx, WX_RX_UNDERSIZE_FRAMES_GOOD);
2088+
rd32(wx, WX_RX_OVERSIZE_FRAMES_GOOD);
2089+
rd64(wx, WX_RX_FRAME_CNT_GOOD_BAD_L);
2090+
rd64(wx, WX_TX_FRAME_CNT_GOOD_BAD_L);
2091+
rd64(wx, WX_RX_MC_FRAMES_GOOD_L);
2092+
rd64(wx, WX_TX_MC_FRAMES_GOOD_L);
2093+
rd64(wx, WX_RX_BC_FRAMES_GOOD_L);
2094+
rd64(wx, WX_TX_BC_FRAMES_GOOD_L);
2095+
rd64(wx, WX_RX_CRC_ERROR_FRAMES_L);
2096+
rd64(wx, WX_RX_LEN_ERROR_FRAMES_L);
2097+
rd32(wx, WX_RDB_LXONTXC);
2098+
rd32(wx, WX_RDB_LXOFFTXC);
2099+
rd32(wx, WX_MAC_LXONOFFRXC);
2100+
}
2101+
EXPORT_SYMBOL(wx_clear_hw_cntrs);
2102+
20042103
/**
20052104
* wx_start_hw - Prepare hardware for Tx/Rx
20062105
* @wx: pointer to hardware structure

‎drivers/net/ethernet/wangxun/libwx/wx_hw.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@ int wx_get_pcie_msix_counts(struct wx *wx, u16 *msix_count, u16 max_msix_count);
4141
int wx_sw_init(struct wx *wx);
4242
int wx_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);
4343
int wx_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);
44+
void wx_update_stats(struct wx *wx);
45+
void wx_clear_hw_cntrs(struct wx *wx);
4446

4547
#endif /* _WX_HW_H_ */

‎drivers/net/ethernet/wangxun/libwx/wx_lib.c‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ static bool wx_is_non_eop(struct wx_ring *rx_ring,
488488
return false;
489489

490490
rx_ring->rx_buffer_info[ntc].skb = skb;
491+
rx_ring->rx_stats.non_eop_descs++;
491492

492493
return true;
493494
}
@@ -721,6 +722,7 @@ static int wx_clean_rx_irq(struct wx_q_vector *q_vector,
721722

722723
/* exit if we failed to retrieve a buffer */
723724
if (!skb) {
725+
rx_ring->rx_stats.alloc_rx_buff_failed++;
724726
rx_buffer->pagecnt_bias++;
725727
break;
726728
}
@@ -877,9 +879,11 @@ static bool wx_clean_tx_irq(struct wx_q_vector *q_vector,
877879

878880
if (__netif_subqueue_stopped(tx_ring->netdev,
879881
tx_ring->queue_index) &&
880-
netif_running(tx_ring->netdev))
882+
netif_running(tx_ring->netdev)) {
881883
netif_wake_subqueue(tx_ring->netdev,
882884
tx_ring->queue_index);
885+
++tx_ring->tx_stats.restart_queue;
886+
}
883887
}
884888

885889
return !!budget;
@@ -956,6 +960,7 @@ static int wx_maybe_stop_tx(struct wx_ring *tx_ring, u16 size)
956960

957961
/* A reprieve! - use start_queue because it doesn't call schedule */
958962
netif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);
963+
++tx_ring->tx_stats.restart_queue;
959964

960965
return 0;
961966
}
@@ -1533,8 +1538,10 @@ static netdev_tx_t wx_xmit_frame_ring(struct sk_buff *skb,
15331538
count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->
15341539
frags[f]));
15351540

1536-
if (wx_maybe_stop_tx(tx_ring, count + 3))
1541+
if (wx_maybe_stop_tx(tx_ring, count + 3)) {
1542+
tx_ring->tx_stats.tx_busy++;
15371543
return NETDEV_TX_BUSY;
1544+
}
15381545

15391546
/* record the location of the first descriptor for this packet */
15401547
first = &tx_ring->tx_buffer_info[tx_ring->next_to_use];
@@ -2665,8 +2672,11 @@ void wx_get_stats64(struct net_device *netdev,
26652672
struct rtnl_link_stats64 *stats)
26662673
{
26672674
struct wx *wx = netdev_priv(netdev);
2675+
struct wx_hw_stats *hwstats;
26682676
int i;
26692677

2678+
wx_update_stats(wx);
2679+
26702680
rcu_read_lock();
26712681
for (i = 0; i < wx->num_rx_queues; i++) {
26722682
struct wx_ring *ring = READ_ONCE(wx->rx_ring[i]);
@@ -2702,6 +2712,12 @@ void wx_get_stats64(struct net_device *netdev,
27022712
}
27032713

27042714
rcu_read_unlock();
2715+
2716+
hwstats = &wx->stats;
2717+
stats->rx_errors = hwstats->crcerrs + hwstats->rlec;
2718+
stats->multicast = hwstats->qmprc;
2719+
stats->rx_length_errors = hwstats->rlec;
2720+
stats->rx_crc_errors = hwstats->crcerrs;
27052721
}
27062722
EXPORT_SYMBOL(wx_get_stats64);
27072723

0 commit comments

Comments
 (0)