Patchwork [net-next,v4,6/8] forcedeth: account for dropped RX frames

login
register
mail settings
Submitter david decotigny
Date Nov. 15, 2011, 7:25 p.m.
Message ID <005cae310e19433c9f68c178805f16c774e8dedd.1321384662.git.david.decotigny@google.com>
Download mbox | patch
Permalink /patch/125865/
State Deferred
Delegated to: David Miller
Headers show

Comments

david decotigny - Nov. 15, 2011, 7:25 p.m.
This adds the stats counter for dropped RX frames.



Signed-off-by: David Decotigny <david.decotigny@google.com>
---
 drivers/net/ethernet/nvidia/forcedeth.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
stephen hemminger - Nov. 15, 2011, 10:21 p.m.
On Tue, 15 Nov 2011 11:25:39 -0800
David Decotigny <david.decotigny@google.com> wrote:

> This adds the stats counter for dropped RX frames.
> 

There is already an rx_dropped statistic in netdevice structure,
why do you need your own in ethtool?


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
david decotigny - Nov. 15, 2011, 10:35 p.m.
Hello,

On Tue, Nov 15, 2011 at 2:21 PM, Stephen Hemminger
<shemminger@vyatta.com> wrote:
> There is already an rx_dropped statistic in netdevice structure,
> why do you need your own in ethtool?

Sorry, I think my commit message was (once again) inaccurate. This
commit doesn't really "add" the stat, instead it adds code to update
the standard stats (struct rtnl_link_stats64).

Regards,
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index ff01d5e..a50c839 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -819,6 +819,7 @@  struct fe_priv {
 	u64 stat_rx_packets;
 	u64 stat_rx_bytes; /* not always available in HW */
 	u64 stat_rx_missed_errors;
+	u64 stat_rx_dropped;
 
 	/* media detection workaround.
 	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
@@ -1762,6 +1763,7 @@  nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)
 		storage->tx_packets       = np->stat_tx_packets;
 		storage->rx_bytes         = np->stat_rx_bytes;
 		storage->tx_bytes         = np->stat_tx_bytes;
+		storage->rx_dropped       = np->stat_rx_dropped;
 		storage->tx_dropped       = np->stat_tx_dropped;
 		storage->rx_missed_errors = np->stat_rx_missed_errors;
 	} while (u64_stats_fetch_retry(&np->swstats_syncp, syncp_start));
@@ -1826,8 +1828,12 @@  static int nv_alloc_rx(struct net_device *dev)
 				np->put_rx.orig = np->first_rx.orig;
 			if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx))
 				np->put_rx_ctx = np->first_rx_ctx;
-		} else
+		} else {
+			u64_stats_update_begin(&np->swstats_syncp);
+			np->stat_rx_dropped++;
+			u64_stats_update_end(&np->swstats_syncp);
 			return 1;
+		}
 	}
 	return 0;
 }
@@ -1858,8 +1864,12 @@  static int nv_alloc_rx_optimized(struct net_device *dev)
 				np->put_rx.ex = np->first_rx.ex;
 			if (unlikely(np->put_rx_ctx++ == np->last_rx_ctx))
 				np->put_rx_ctx = np->first_rx_ctx;
-		} else
+		} else {
+			u64_stats_update_begin(&np->swstats_syncp);
+			np->stat_rx_dropped++;
+			u64_stats_update_end(&np->swstats_syncp);
 			return 1;
+		}
 	}
 	return 0;
 }