korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 18:44:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

net/sonic: Fix interface error stats collection

Browse Source 
The tx_aborted_errors statistic should count packets flagged with EXD,
EXC, FU, or BCM bits because those bits denote an aborted transmission.
That corresponds to the bitmask 0x0446, not 0x0642. Use macros for these
constants to avoid mistakes. Better to leave out FIFO Underruns (FU) as
there's a separate counter for that purpose.

Don't lump all these errors in with the general tx_errors counter as
that's used for tx timeout events.

On the rx side, don't count RDE and RBAE interrupts as dropped packets.
These interrupts don't indicate a lost packet, just a lack of resources.
When a lack of resources results in a lost packet, this gets reported
in the rx_missed_errors counter (along with RFO events).

Don't double-count rx_frame_errors and rx_crc_errors.

Don't use the general rx_errors counter for events that already have
special counters.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Finn Thain 2020-01-23 09:07:26 +11:00 committed by David S. Miller
parent e3885f5761
commit 427db97df1
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/natsemi/sonic.c
View File

@ -330,18 +330,19 @@ static irqreturn_t sonic_interrupt(int irq, void *dev_id)
if ((td_status = sonic_tda_get(dev, entry, SONIC_TD_STATUS)) == 0) if ((td_status = sonic_tda_get(dev, entry, SONIC_TD_STATUS)) == 0)
break; break;
if (td_status & 0x0001) { if (td_status & SONIC_TCR_PTX) {
lp->stats.tx_packets++; lp->stats.tx_packets++;
lp->stats.tx_bytes += sonic_tda_get(dev, entry, SONIC_TD_PKTSIZE); lp->stats.tx_bytes += sonic_tda_get(dev, entry, SONIC_TD_PKTSIZE);
} else { } else {
lp->stats.tx_errors++; if (td_status & (SONIC_TCR_EXD |
if (td_status & 0x0642) SONIC_TCR_EXC | SONIC_TCR_BCM))
lp->stats.tx_aborted_errors++; lp->stats.tx_aborted_errors++;
if (td_status & 0x0180) if (td_status &
(SONIC_TCR_NCRS | SONIC_TCR_CRLS))
lp->stats.tx_carrier_errors++; lp->stats.tx_carrier_errors++;
if (td_status & 0x0020) if (td_status & SONIC_TCR_OWC)
lp->stats.tx_window_errors++; lp->stats.tx_window_errors++;
if (td_status & 0x0004) if (td_status & SONIC_TCR_FU)
lp->stats.tx_fifo_errors++; lp->stats.tx_fifo_errors++;
} }
@ -371,17 +372,14 @@ static irqreturn_t sonic_interrupt(int irq, void *dev_id)
if (status & SONIC_INT_RFO) { if (status & SONIC_INT_RFO) {
netif_dbg(lp, rx_err, dev, "%s: rx fifo overrun\n", netif_dbg(lp, rx_err, dev, "%s: rx fifo overrun\n",
__func__); __func__);
lp->stats.rx_fifo_errors++;
} }
if (status & SONIC_INT_RDE) { if (status & SONIC_INT_RDE) {
netif_dbg(lp, rx_err, dev, "%s: rx descriptors exhausted\n", netif_dbg(lp, rx_err, dev, "%s: rx descriptors exhausted\n",
__func__); __func__);
lp->stats.rx_dropped++;
} }
if (status & SONIC_INT_RBAE) { if (status & SONIC_INT_RBAE) {
netif_dbg(lp, rx_err, dev, "%s: rx buffer area exceeded\n", netif_dbg(lp, rx_err, dev, "%s: rx buffer area exceeded\n",
__func__); __func__);
lp->stats.rx_dropped++;
} }
/* counter overruns; all counters are 16bit wide */ /* counter overruns; all counters are 16bit wide */
@ -473,11 +471,6 @@ static void sonic_rx(struct net_device *dev)
sonic_rra_put(dev, entry, SONIC_RR_BUFADR_H, bufadr_h); sonic_rra_put(dev, entry, SONIC_RR_BUFADR_H, bufadr_h);
} else { } else {
/* This should only happen, if we enable accepting broken packets. */ /* This should only happen, if we enable accepting broken packets. */
lp->stats.rx_errors++;
if (status & SONIC_RCR_FAER)
lp->stats.rx_frame_errors++;
if (status & SONIC_RCR_CRCR)
lp->stats.rx_crc_errors++;
} }
if (status & SONIC_RCR_LPKT) { if (status & SONIC_RCR_LPKT) {
/* /*

1
drivers/net/ethernet/natsemi/sonic.h
View File

@ -175,6 +175,7 @@
#define SONIC_TCR_NCRS 0x0100 #define SONIC_TCR_NCRS 0x0100
#define SONIC_TCR_CRLS 0x0080 #define SONIC_TCR_CRLS 0x0080
#define SONIC_TCR_EXC 0x0040 #define SONIC_TCR_EXC 0x0040
#define SONIC_TCR_OWC 0x0020
#define SONIC_TCR_PMB 0x0008 #define SONIC_TCR_PMB 0x0008
#define SONIC_TCR_FU 0x0004 #define SONIC_TCR_FU 0x0004
#define SONIC_TCR_BCM 0x0002 #define SONIC_TCR_BCM 0x0002