netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Decotigny <david.decotigny@google.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
	Ian Campbell <ian.campbell@citrix.com>,
	Eric Dumazet <eric.dumazet@gmail.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
	Ben Hutchings <bhutchings@solarflare.com>,
	Jiri Pirko <jpirko@redhat.com>, Joe Perches <joe@perches.com>,
	Szymon Janc <szymon@janc.net.pl>,
	Richard Jones <rick.jones2@hp.com>,
	Ayaz Abdulla <AAbdulla@nvidia.com>,
	David Decotigny <david.decotigny@google.com>
Subject: [PATCH net-next v5 08/10] forcedeth: account for dropped RX frames
Date: Tue, 15 Nov 2011 21:15:56 -0800	[thread overview]
Message-ID: <ed7284fbf466dee109a5fb6b33ad1d0443403231.1321420513.git.david.decotigny@google.com> (raw)
In-Reply-To: <cover.1321420513.git.david.decotigny@google.com>
In-Reply-To: <cover.1321420513.git.david.decotigny@google.com>

This adds code to update the stats counter for dropped RX frames.



Signed-off-by: David Decotigny <david.decotigny@google.com>
---
 drivers/net/ethernet/nvidia/forcedeth.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 6aeb0d6..d9b5a4d 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -824,6 +824,7 @@ struct fe_priv {
 	struct nv_driver_stat stat_rx_packets;
 	struct nv_driver_stat stat_rx_bytes; /* not always available in HW */
 	struct nv_driver_stat stat_rx_missed_errors;
+	struct nv_driver_stat stat_rx_dropped;
 
 	/* media detection workaround.
 	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
@@ -1739,6 +1740,7 @@ static void nv_update_stats(struct net_device *dev)
 	/* update software stats */
 	NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_packets);
 	NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_bytes);
+	NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_dropped);
 	NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_rx_missed_errors);
 
 	NV_DRIVER_STAT_UPDATE_TOTAL(&np->stat_tx_packets);
@@ -1786,6 +1788,8 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)
 			&np->stat_tx_bytes);
 		storage->rx_errors  = np->estats.rx_errors_total;
 		storage->tx_errors  = np->estats.tx_errors_total;
+		storage->rx_dropped = NV_DRIVER_STAT_GET_TOTAL(
+			&np->stat_rx_dropped);
 		storage->tx_dropped = NV_DRIVER_STAT_GET_TOTAL(
 			&np->stat_tx_dropped);
 
@@ -1841,8 +1845,10 @@ 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 {
+			NV_DRIVER_STAT_ATOMIC_INC(&np->stat_rx_dropped);
 			return 1;
+		}
 	}
 	return 0;
 }
@@ -1873,8 +1879,10 @@ 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 {
+			NV_DRIVER_STAT_ATOMIC_INC(&np->stat_rx_dropped);
 			return 1;
+		}
 	}
 	return 0;
 }
-- 
1.7.3.1

  parent reply	other threads:[~2011-11-16  5:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-16  5:15 [PATCH net-next v5 00/10] net-sysfs+forcedeth: stats & debug enhancements David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 01/10] forcedeth: fix stats on hardware without extended stats support David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 02/10] net-sysfs: fixed minor sparse warning David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 03/10] kbuild: document RPS/XPS network Kconfig options David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 04/10] net: provide counter for tx_timeout errors in sysfs David Decotigny
2011-11-16 16:51   ` Stephen Hemminger
2011-11-16  5:15 ` [PATCH net-next v5 05/10] forcedeth: Add messages to indicate using MSI or MSI-X David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 06/10] forcedeth: allow to silence "TX timeout" debug messages David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 07/10] forcedeth: implement ndo_get_stats64() API David Decotigny
2011-11-16 16:55   ` Stephen Hemminger
2011-11-16 17:14     ` Ben Hutchings
2011-11-16 19:25       ` David Decotigny
2011-11-16 19:32         ` Ben Hutchings
2011-11-16 20:32           ` Eric Dumazet
2011-11-16 20:46             ` David Decotigny
2011-11-16  5:15 ` David Decotigny [this message]
2011-11-16  5:15 ` [PATCH net-next v5 09/10] forcedeth: stats updated with a deferrable timer David Decotigny
2011-11-16  5:15 ` [PATCH net-next v5 10/10] forcedeth: whitespace/indentation fixes David Decotigny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ed7284fbf466dee109a5fb6b33ad1d0443403231.1321420513.git.david.decotigny@google.com \
    --to=david.decotigny@google.com \
    --cc=AAbdulla@nvidia.com \
    --cc=bhutchings@solarflare.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=ian.campbell@citrix.com \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=joe@perches.com \
    --cc=jpirko@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rick.jones2@hp.com \
    --cc=szymon@janc.net.pl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).