diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2011-07-12 22:09:18 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-07-12 22:09:18 -0700 |
| commit | 1e75896294d282ecd5b1717fcb3f6aa2908d5946 (patch) | |
| tree | e4e886bf5852fde01f085af272cd280e37f0843a | |
| parent | e1000e: use GFP_KERNEL allocations at init time (diff) | |
| download | linux-dev-1e75896294d282ecd5b1717fcb3f6aa2908d5946.tar.xz linux-dev-1e75896294d282ecd5b1717fcb3f6aa2908d5946.zip | |
be2net: account for skb allocation failures
If we cannot allocate new skbs in RX completion handler, we should
increase netdevice rx_dropped counter, not spam console messages.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/benet/be.h | 1 | ||||
| -rw-r--r-- | drivers/net/benet/be_ethtool.c | 1 | ||||
| -rw-r--r-- | drivers/net/benet/be_main.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 9aa1534c7d88..72ec00f2d032 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -199,6 +199,7 @@ struct be_rx_stats { u32 rx_polls; /* number of times NAPI called poll function */ u32 rx_events; /* number of ucast rx completion events */ u32 rx_compl; /* number of rx completion entries processed */ + ulong rx_dropped; /* number of skb allocation errors */ ulong rx_jiffies; u64 rx_bytes; u64 rx_bytes_prev; diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 30c1386027f8..7fd8130d86ea 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -102,6 +102,7 @@ static const struct be_ethtool_stat et_rx_stats[] = { {DRVSTAT_RX_INFO(rx_compl)}, {DRVSTAT_RX_INFO(rx_mcast_pkts)}, {DRVSTAT_RX_INFO(rx_post_fail)}, + {DRVSTAT_RX_INFO(rx_dropped)}, {ERXSTAT_INFO(rx_drops_no_fragments)} }; #define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats)) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 4ebd7000b0cf..f7d6d9de6a01 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -431,6 +431,7 @@ void netdev_stats_update(struct be_adapter *adapter) pkts += rx_stats(rxo)->rx_pkts; bytes += rx_stats(rxo)->rx_bytes; mcast += rx_stats(rxo)->rx_mcast_pkts; + drops += rx_stats(rxo)->rx_dropped; /* no space in linux buffers: best possible approximation */ if (adapter->generation == BE_GEN3) { if (!(lancer_chip(adapter))) { @@ -1181,8 +1182,7 @@ static void be_rx_compl_process(struct be_adapter *adapter, skb = netdev_alloc_skb_ip_align(netdev, BE_HDR_LEN); if (unlikely(!skb)) { - if (net_ratelimit()) - dev_warn(&adapter->pdev->dev, "skb alloc failed\n"); + rxo->stats.rx_dropped++; be_rx_compl_discard(adapter, rxo, rxcp); return; } |