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 v4 7/8] forcedeth: new ethtool stat counter for TX timeouts
Date: Tue, 15 Nov 2011 11:25:40 -0800	[thread overview]
Message-ID: <52bc9f8b3924e22f6921bbc41be4865030215747.1321384662.git.david.decotigny@google.com> (raw)
In-Reply-To: <cover.1321384662.git.david.decotigny@google.com>
In-Reply-To: <cover.1321384662.git.david.decotigny@google.com>

This change publishes a new ethtool stats: tx_timeout that counts the
number of times the tx_timeout callback was triggered.



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

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index a50c839..7284f40 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -634,6 +634,7 @@ static const struct nv_ethtool_str nv_estats_str[] = {
 	{ "rx_packets" },
 	{ "rx_errors_total" },
 	{ "tx_errors_total" },
+	{ "tx_timeout" },
 
 	/* version 2 stats */
 	{ "tx_deferral" },
@@ -674,6 +675,7 @@ struct nv_ethtool_stats {
 	u64 rx_packets; /* should be ifconfig->rx_packets */
 	u64 rx_errors_total;
 	u64 tx_errors_total;
+	u64 tx_timeout;
 
 	/* version 2 stats */
 	u64 tx_deferral;
@@ -848,6 +850,9 @@ struct fe_priv {
 	u64 stat_tx_bytes;
 	u64 stat_tx_dropped;
 
+	/* TX software stats exported by ethtool */
+	atomic_t stat_tx_timeout;  /* TX timeouts since last nv_update_stats */
+
 	/* msi/msi-x fields */
 	u32 msi_flags;
 	struct msix_entry msi_x_entry[NV_MSI_X_MAX_VECTORS];
@@ -1731,6 +1736,8 @@ static void nv_update_stats(struct net_device *dev)
 		np->estats.tx_multicast += readl(base + NvRegTxMulticast);
 		np->estats.tx_broadcast += readl(base + NvRegTxBroadcast);
 	}
+
+	np->estats.tx_timeout += atomic_xchg(&np->stat_tx_timeout, 0);
 }
 
 /*
@@ -2627,6 +2634,8 @@ static void nv_tx_timeout(struct net_device *dev)
 		}
 	}
 
+	atomic_inc(&np->stat_tx_timeout);
+
 	spin_lock_irq(&np->lock);
 
 	/* 1) stop tx engine */
-- 
1.7.3.1

  parent reply	other threads:[~2011-11-15 19:25 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-15 19:25 [PATCH net-next v4 0/8] forcedeth: stats & debug enhancements David Decotigny
2011-11-15 19:25 ` [PATCH net-next v4 1/8] forcedeth: fix stats on hardware without extended stats support David Decotigny
2011-11-15 19:25 ` [PATCH net-next v4 2/8] forcedeth: Add messages to indicate using MSI or MSI-X David Decotigny
2011-11-15 19:32   ` Joe Perches
     [not found]   ` <cover.1321386214.git.david.decotigny@google.com>
2011-11-15 19:51     ` David Decotigny
2011-11-15 19:25 ` [PATCH net-next v4 3/8] forcedeth: allow to silence "TX timeout" debug messages David Decotigny
2011-11-15 22:27   ` Stephen Hemminger
2011-11-15 19:25 ` [PATCH net-next v4 4/8] forcedeth: expose module parameters in /sys/module David Decotigny
2011-11-15 22:32   ` Stephen Hemminger
2011-11-15 22:33   ` Stephen Hemminger
2011-11-15 19:25 ` [PATCH net-next v4 5/8] forcedeth: implement ndo_get_stats64() API David Decotigny
2011-11-15 22:01   ` David Decotigny
2011-11-15 19:25 ` [PATCH net-next v4 6/8] forcedeth: account for dropped RX frames David Decotigny
2011-11-15 22:21   ` Stephen Hemminger
2011-11-15 22:35     ` David Decotigny
2011-11-15 19:25 ` David Decotigny [this message]
2011-11-15 19:25 ` [PATCH net-next v4 8/8] forcedeth: stats updated with a deferrable timer 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=52bc9f8b3924e22f6921bbc41be4865030215747.1321384662.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).