netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Dave Ertman <david.m.ertman@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Andrew Bowers <andrewx.bowers@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 13/15] ice: Report stats when VSI is down
Date: Tue,  3 Sep 2019 21:35:10 -0700	[thread overview]
Message-ID: <20190904043512.28066-14-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20190904043512.28066-1-jeffrey.t.kirsher@intel.com>

From: Dave Ertman <david.m.ertman@intel.com>

There is currently a check in get_ndo_stats that
returns before updating stats if the VSI is down
or there are no Tx or Rx queues.  This causes the
netdev to report zero stats with the netdev is down.

Remove the check so that the behavior of reporting
stats is the same as it was in IXGBE.

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 732397a2e8fa..50a17a0337be 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3477,12 +3477,16 @@ void ice_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
 
 	vsi_stats = &vsi->net_stats;
 
-	if (test_bit(__ICE_DOWN, vsi->state) || !vsi->num_txq || !vsi->num_rxq)
+	if (!vsi->num_txq || !vsi->num_rxq)
 		return;
+
 	/* netdev packet/byte stats come from ring counter. These are obtained
 	 * by summing up ring counters (done by ice_update_vsi_ring_stats).
+	 * But, only call the update routine and read the registers if VSI is
+	 * not down.
 	 */
-	ice_update_vsi_ring_stats(vsi);
+	if (!test_bit(__ICE_DOWN, vsi->state))
+		ice_update_vsi_ring_stats(vsi);
 	stats->tx_packets = vsi_stats->tx_packets;
 	stats->tx_bytes = vsi_stats->tx_bytes;
 	stats->rx_packets = vsi_stats->rx_packets;
-- 
2.21.0


  parent reply	other threads:[~2019-09-04  4:35 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-04  4:34 [net-next 00/15][pull request] 100GbE Intel Wired LAN Driver Updates 2019-09-03 Jeff Kirsher
2019-09-04  4:34 ` [net-next 01/15] ice: Fix EMP reset handling Jeff Kirsher
2019-09-04  4:34 ` [net-next 02/15] ice: Fix resource leak in ice_remove_rule_internal() Jeff Kirsher
2019-09-04  4:35 ` [net-next 03/15] ice: Report what the user set for coalesce [tx|rx]-usecs Jeff Kirsher
2019-09-04  4:35 ` [net-next 04/15] ice: Deduce TSA value from the priority value in the CEE mode Jeff Kirsher
2019-09-04  4:35 ` [net-next 05/15] ice: add needed PFR during driver unload Jeff Kirsher
2019-09-04  4:35 ` [net-next 06/15] ice: update driver unloading field for Queue Shutdown AQ command Jeff Kirsher
2019-09-04  4:35 ` [net-next 07/15] ice: add print of autoneg state to link message Jeff Kirsher
2019-09-04  4:35 ` [net-next 08/15] ice: print extra message if topology issue Jeff Kirsher
2019-09-04  4:35 ` [net-next 09/15] ice: Cleanup defines in ice_type.h Jeff Kirsher
2019-09-04  4:35 ` [net-next 10/15] ice: Limit Max TCs on devices with more than 4 ports Jeff Kirsher
2019-09-04  4:35 ` [net-next 11/15] ice: Correctly handle return values for init DCB Jeff Kirsher
2019-09-04  4:35 ` [net-next 12/15] ice: Always notify FW of VF reset Jeff Kirsher
2019-09-04  4:35 ` Jeff Kirsher [this message]
2019-09-04  4:35 ` [net-next 14/15] ice: Remove enable DCB when SW LLDP is activated Jeff Kirsher
2019-09-04  4:35 ` [net-next 15/15] ice: Only disable VLAN pruning for the VF when all VLANs are removed Jeff Kirsher
2019-09-04  4:51 ` [net-next 00/15][pull request] 100GbE Intel Wired LAN Driver Updates 2019-09-03 David Miller

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=20190904043512.28066-14-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=andrewx.bowers@intel.com \
    --cc=davem@davemloft.net \
    --cc=david.m.ertman@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /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).