Skip to content

Commit 86c72fd

Browse files
davem330davem330
committed
Merge branch 'atl_stats'
Sabrina Dubroca says: ==================== atheros: modify statistics code Following Ben Hutchings's advice on how to fill net_stats in alx [1], this patch modifies the other atheros ethernet drivers similarly. Minor whitespace/empty line changes in atl1c and atl1e to make the code completely consistent between atl1c, atl1e, and alx. I don't have this hardware, so these patches have only been compile-tested. v2 (changes only in atl1): - don't set soft_stats.rx_missed_errors (Ben) - add errors to soft_stats.{rx,tx}_packets (Ben) - add soft_stats.rx_dropped field and update soft_stats.rx_dropped instead of netdev->stats (overwritten) outside of the stats update function Detail of the changes (v1): * atl1/atl1c/atl1e - fix collisions computation - rx_dropped = rx_rrd_ov - rx_over_errors = 0 - rx_missed_errors = 0 - X_packets = X_ok + X_errors * only atl1c/atl1e - add rx_rxf_ov to rx_errors [1] http://www.spinics.net/lists/netdev/msg264930.html ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 88bfe6e + e3d21ea commit 86c72fd

File tree

4 files changed

+65
-40
lines changed

4 files changed

+65
-40
lines changed

‎drivers/net/ethernet/atheros/atl1c/atl1c_main.c

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,31 +1500,40 @@ static struct net_device_stats *atl1c_get_stats(struct net_device *netdev)
15001500
struct net_device_stats *net_stats = &netdev->stats;
15011501

15021502
atl1c_update_hw_stats(adapter);
1503-
net_stats->rx_packets = hw_stats->rx_ok;
1504-
net_stats->tx_packets = hw_stats->tx_ok;
15051503
net_stats->rx_bytes = hw_stats->rx_byte_cnt;
15061504
net_stats->tx_bytes = hw_stats->tx_byte_cnt;
15071505
net_stats->multicast = hw_stats->rx_mcast;
15081506
net_stats->collisions = hw_stats->tx_1_col +
1509-
hw_stats->tx_2_col * 2 +
1510-
hw_stats->tx_late_col + hw_stats->tx_abort_col;
1511-
net_stats->rx_errors = hw_stats->rx_frag + hw_stats->rx_fcs_err +
1512-
hw_stats->rx_len_err + hw_stats->rx_sz_ov +
1513-
hw_stats->rx_rrd_ov + hw_stats->rx_align_err;
1507+
hw_stats->tx_2_col +
1508+
hw_stats->tx_late_col +
1509+
hw_stats->tx_abort_col;
1510+
1511+
net_stats->rx_errors = hw_stats->rx_frag +
1512+
hw_stats->rx_fcs_err +
1513+
hw_stats->rx_len_err +
1514+
hw_stats->rx_sz_ov +
1515+
hw_stats->rx_rrd_ov +
1516+
hw_stats->rx_align_err +
1517+
hw_stats->rx_rxf_ov;
1518+
15141519
net_stats->rx_fifo_errors = hw_stats->rx_rxf_ov;
15151520
net_stats->rx_length_errors = hw_stats->rx_len_err;
15161521
net_stats->rx_crc_errors = hw_stats->rx_fcs_err;
15171522
net_stats->rx_frame_errors = hw_stats->rx_align_err;
1518-
net_stats->rx_over_errors = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
1523+
net_stats->rx_dropped = hw_stats->rx_rrd_ov;
15191524

1520-
net_stats->rx_missed_errors = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
1525+
net_stats->tx_errors = hw_stats->tx_late_col +
1526+
hw_stats->tx_abort_col +
1527+
hw_stats->tx_underrun +
1528+
hw_stats->tx_trunc;
15211529

1522-
net_stats->tx_errors = hw_stats->tx_late_col + hw_stats->tx_abort_col +
1523-
hw_stats->tx_underrun + hw_stats->tx_trunc;
15241530
net_stats->tx_fifo_errors = hw_stats->tx_underrun;
15251531
net_stats->tx_aborted_errors = hw_stats->tx_abort_col;
15261532
net_stats->tx_window_errors = hw_stats->tx_late_col;
15271533

1534+
net_stats->rx_packets = hw_stats->rx_ok + net_stats->rx_errors;
1535+
net_stats->tx_packets = hw_stats->tx_ok + net_stats->tx_errors;
1536+
15281537
return net_stats;
15291538
}
15301539

‎drivers/net/ethernet/atheros/atl1e/atl1e_main.c

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,32 +1177,40 @@ static struct net_device_stats *atl1e_get_stats(struct net_device *netdev)
11771177
struct atl1e_hw_stats *hw_stats = &adapter->hw_stats;
11781178
struct net_device_stats *net_stats = &netdev->stats;
11791179

1180-
net_stats->rx_packets = hw_stats->rx_ok;
1181-
net_stats->tx_packets = hw_stats->tx_ok;
11821180
net_stats->rx_bytes = hw_stats->rx_byte_cnt;
11831181
net_stats->tx_bytes = hw_stats->tx_byte_cnt;
11841182
net_stats->multicast = hw_stats->rx_mcast;
11851183
net_stats->collisions = hw_stats->tx_1_col +
1186-
hw_stats->tx_2_col * 2 +
1187-
hw_stats->tx_late_col + hw_stats->tx_abort_col;
1184+
hw_stats->tx_2_col +
1185+
hw_stats->tx_late_col +
1186+
hw_stats->tx_abort_col;
1187+
1188+
net_stats->rx_errors = hw_stats->rx_frag +
1189+
hw_stats->rx_fcs_err +
1190+
hw_stats->rx_len_err +
1191+
hw_stats->rx_sz_ov +
1192+
hw_stats->rx_rrd_ov +
1193+
hw_stats->rx_align_err +
1194+
hw_stats->rx_rxf_ov;
11881195

1189-
net_stats->rx_errors = hw_stats->rx_frag + hw_stats->rx_fcs_err +
1190-
hw_stats->rx_len_err + hw_stats->rx_sz_ov +
1191-
hw_stats->rx_rrd_ov + hw_stats->rx_align_err;
11921196
net_stats->rx_fifo_errors = hw_stats->rx_rxf_ov;
11931197
net_stats->rx_length_errors = hw_stats->rx_len_err;
11941198
net_stats->rx_crc_errors = hw_stats->rx_fcs_err;
11951199
net_stats->rx_frame_errors = hw_stats->rx_align_err;
1196-
net_stats->rx_over_errors = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
1200+
net_stats->rx_dropped = hw_stats->rx_rrd_ov;
11971201

1198-
net_stats->rx_missed_errors = hw_stats->rx_rrd_ov + hw_stats->rx_rxf_ov;
1202+
net_stats->tx_errors = hw_stats->tx_late_col +
1203+
hw_stats->tx_abort_col +
1204+
hw_stats->tx_underrun +
1205+
hw_stats->tx_trunc;
11991206

1200-
net_stats->tx_errors = hw_stats->tx_late_col + hw_stats->tx_abort_col +
1201-
hw_stats->tx_underrun + hw_stats->tx_trunc;
12021207
net_stats->tx_fifo_errors = hw_stats->tx_underrun;
12031208
net_stats->tx_aborted_errors = hw_stats->tx_abort_col;
12041209
net_stats->tx_window_errors = hw_stats->tx_late_col;
12051210

1211+
net_stats->rx_packets = hw_stats->rx_ok + net_stats->rx_errors;
1212+
net_stats->tx_packets = hw_stats->tx_ok + net_stats->tx_errors;
1213+
12061214
return net_stats;
12071215
}
12081216

‎drivers/net/ethernet/atheros/atlx/atl1.c

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,33 +1678,42 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
16781678
struct net_device *netdev = adapter->netdev;
16791679
struct stats_msg_block *smb = adapter->smb.smb;
16801680

1681+
u64 new_rx_errors = smb->rx_frag +
1682+
smb->rx_fcs_err +
1683+
smb->rx_len_err +
1684+
smb->rx_sz_ov +
1685+
smb->rx_rxf_ov +
1686+
smb->rx_rrd_ov +
1687+
smb->rx_align_err;
1688+
u64 new_tx_errors = smb->tx_late_col +
1689+
smb->tx_abort_col +
1690+
smb->tx_underrun +
1691+
smb->tx_trunc;
1692+
16811693
/* Fill out the OS statistics structure */
1682-
adapter->soft_stats.rx_packets += smb->rx_ok;
1683-
adapter->soft_stats.tx_packets += smb->tx_ok;
1694+
adapter->soft_stats.rx_packets += smb->rx_ok + new_rx_errors;
1695+
adapter->soft_stats.tx_packets += smb->tx_ok + new_tx_errors;
16841696
adapter->soft_stats.rx_bytes += smb->rx_byte_cnt;
16851697
adapter->soft_stats.tx_bytes += smb->tx_byte_cnt;
16861698
adapter->soft_stats.multicast += smb->rx_mcast;
1687-
adapter->soft_stats.collisions += (smb->tx_1_col + smb->tx_2_col * 2 +
1688-
smb->tx_late_col + smb->tx_abort_col * adapter->hw.max_retry);
1699+
adapter->soft_stats.collisions += smb->tx_1_col +
1700+
smb->tx_2_col +
1701+
smb->tx_late_col +
1702+
smb->tx_abort_col;
16891703

16901704
/* Rx Errors */
1691-
adapter->soft_stats.rx_errors += (smb->rx_frag + smb->rx_fcs_err +
1692-
smb->rx_len_err + smb->rx_sz_ov + smb->rx_rxf_ov +
1693-
smb->rx_rrd_ov + smb->rx_align_err);
1705+
adapter->soft_stats.rx_errors += new_rx_errors;
16941706
adapter->soft_stats.rx_fifo_errors += smb->rx_rxf_ov;
16951707
adapter->soft_stats.rx_length_errors += smb->rx_len_err;
16961708
adapter->soft_stats.rx_crc_errors += smb->rx_fcs_err;
16971709
adapter->soft_stats.rx_frame_errors += smb->rx_align_err;
1698-
adapter->soft_stats.rx_missed_errors += (smb->rx_rrd_ov +
1699-
smb->rx_rxf_ov);
17001710

17011711
adapter->soft_stats.rx_pause += smb->rx_pause;
17021712
adapter->soft_stats.rx_rrd_ov += smb->rx_rrd_ov;
17031713
adapter->soft_stats.rx_trunc += smb->rx_sz_ov;
17041714

17051715
/* Tx Errors */
1706-
adapter->soft_stats.tx_errors += (smb->tx_late_col +
1707-
smb->tx_abort_col + smb->tx_underrun + smb->tx_trunc);
1716+
adapter->soft_stats.tx_errors += new_tx_errors;
17081717
adapter->soft_stats.tx_fifo_errors += smb->tx_underrun;
17091718
adapter->soft_stats.tx_aborted_errors += smb->tx_abort_col;
17101719
adapter->soft_stats.tx_window_errors += smb->tx_late_col;
@@ -1718,23 +1727,18 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
17181727
adapter->soft_stats.tx_trunc += smb->tx_trunc;
17191728
adapter->soft_stats.tx_pause += smb->tx_pause;
17201729

1721-
netdev->stats.rx_packets = adapter->soft_stats.rx_packets;
1722-
netdev->stats.tx_packets = adapter->soft_stats.tx_packets;
17231730
netdev->stats.rx_bytes = adapter->soft_stats.rx_bytes;
17241731
netdev->stats.tx_bytes = adapter->soft_stats.tx_bytes;
17251732
netdev->stats.multicast = adapter->soft_stats.multicast;
17261733
netdev->stats.collisions = adapter->soft_stats.collisions;
17271734
netdev->stats.rx_errors = adapter->soft_stats.rx_errors;
1728-
netdev->stats.rx_over_errors =
1729-
adapter->soft_stats.rx_missed_errors;
17301735
netdev->stats.rx_length_errors =
17311736
adapter->soft_stats.rx_length_errors;
17321737
netdev->stats.rx_crc_errors = adapter->soft_stats.rx_crc_errors;
17331738
netdev->stats.rx_frame_errors =
17341739
adapter->soft_stats.rx_frame_errors;
17351740
netdev->stats.rx_fifo_errors = adapter->soft_stats.rx_fifo_errors;
1736-
netdev->stats.rx_missed_errors =
1737-
adapter->soft_stats.rx_missed_errors;
1741+
netdev->stats.rx_dropped = adapter->soft_stats.rx_rrd_ov;
17381742
netdev->stats.tx_errors = adapter->soft_stats.tx_errors;
17391743
netdev->stats.tx_fifo_errors = adapter->soft_stats.tx_fifo_errors;
17401744
netdev->stats.tx_aborted_errors =
@@ -1743,6 +1747,9 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
17431747
adapter->soft_stats.tx_window_errors;
17441748
netdev->stats.tx_carrier_errors =
17451749
adapter->soft_stats.tx_carrier_errors;
1750+
1751+
netdev->stats.rx_packets = adapter->soft_stats.rx_packets;
1752+
netdev->stats.tx_packets = adapter->soft_stats.tx_packets;
17461753
}
17471754

17481755
static void atl1_update_mailbox(struct atl1_adapter *adapter)
@@ -1872,7 +1879,7 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)
18721879
adapter->rx_buffer_len);
18731880
if (unlikely(!skb)) {
18741881
/* Better luck next round */
1875-
adapter->netdev->stats.rx_dropped++;
1882+
adapter->soft_stats.rx_dropped++;
18761883
break;
18771884
}
18781885

‎drivers/net/ethernet/atheros/atlx/atl1.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ struct atl1_sft_stats {
666666
u64 rx_errors;
667667
u64 rx_length_errors;
668668
u64 rx_crc_errors;
669+
u64 rx_dropped;
669670
u64 rx_frame_errors;
670671
u64 rx_fifo_errors;
671672
u64 rx_missed_errors;

0 commit comments

Comments
 (0)