hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Dumazet 2011-07-12 22:09:18 -07:00 committed by David S. Miller
parent c2fed9965c
commit 1e75896294
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/benet/be.h
View File

@ -199,6 +199,7 @@ struct be_rx_stats {
u32 rx_polls; /* number of times NAPI called poll function */ u32 rx_polls; /* number of times NAPI called poll function */
u32 rx_events; /* number of ucast rx completion events */ u32 rx_events; /* number of ucast rx completion events */
u32 rx_compl; /* number of rx completion entries processed */ u32 rx_compl; /* number of rx completion entries processed */
ulong rx_dropped; /* number of skb allocation errors */
ulong rx_jiffies; ulong rx_jiffies;
u64 rx_bytes; u64 rx_bytes;
u64 rx_bytes_prev; u64 rx_bytes_prev;

1
drivers/net/benet/be_ethtool.c
View File

@ -102,6 +102,7 @@ static const struct be_ethtool_stat et_rx_stats[] = {
{DRVSTAT_RX_INFO(rx_compl)}, {DRVSTAT_RX_INFO(rx_compl)},
{DRVSTAT_RX_INFO(rx_mcast_pkts)}, {DRVSTAT_RX_INFO(rx_mcast_pkts)},
{DRVSTAT_RX_INFO(rx_post_fail)}, {DRVSTAT_RX_INFO(rx_post_fail)},
{DRVSTAT_RX_INFO(rx_dropped)},
{ERXSTAT_INFO(rx_drops_no_fragments)} {ERXSTAT_INFO(rx_drops_no_fragments)}
}; };
#define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats)) #define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats))

4
drivers/net/benet/be_main.c
View File

@ -431,6 +431,7 @@ void netdev_stats_update(struct be_adapter *adapter)
pkts += rx_stats(rxo)->rx_pkts; pkts += rx_stats(rxo)->rx_pkts;
bytes += rx_stats(rxo)->rx_bytes; bytes += rx_stats(rxo)->rx_bytes;
mcast += rx_stats(rxo)->rx_mcast_pkts; mcast += rx_stats(rxo)->rx_mcast_pkts;
drops += rx_stats(rxo)->rx_dropped;
/* no space in linux buffers: best possible approximation */ /* no space in linux buffers: best possible approximation */
if (adapter->generation == BE_GEN3) { if (adapter->generation == BE_GEN3) {
if (!(lancer_chip(adapter))) { 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); skb = netdev_alloc_skb_ip_align(netdev, BE_HDR_LEN);
if (unlikely(!skb)) { if (unlikely(!skb)) {
if (net_ratelimit()) rxo->stats.rx_dropped++;
dev_warn(&adapter->pdev->dev, "skb alloc failed\n");
be_rx_compl_discard(adapter, rxo, rxcp); be_rx_compl_discard(adapter, rxo, rxcp);
return; return;
} }