netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Or Gerlitz <ogerlitz@mellanox.com>,
	Tal Alon <talal@mellanox.com>,
	Eran Ben Elisha <eranbe@mellanox.com>,
	Gal Pressman <galp@mellanox.com>,
	Saeed Mahameed <saeedm@mellanox.com>
Subject: [PATCH net-next 01/12] net/mlx5e: Report additional error statistics in get stats ndo
Date: Fri, 22 Apr 2016 22:00:36 +0300	[thread overview]
Message-ID: <1461351647-27412-2-git-send-email-saeedm@mellanox.com> (raw)
In-Reply-To: <1461351647-27412-1-git-send-email-saeedm@mellanox.com>

From: Gal Pressman <galp@mellanox.com>

Provide rtnl_link_stats64 with information regarding physical errors to be
seen in ifconfig and ip tool.

Signed-off-by: Gal Pressman <galp@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c |   39 +++++++++++++++++---
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d485d1e..6270f8d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2074,18 +2074,45 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
 	struct mlx5e_priv *priv = netdev_priv(dev);
 	struct mlx5e_vport_stats *vstats = &priv->stats.vport;
+	struct mlx5e_pport_stats *pstats = &priv->stats.pport;
 
 	stats->rx_packets = vstats->rx_packets;
 	stats->rx_bytes   = vstats->rx_bytes;
 	stats->tx_packets = vstats->tx_packets;
 	stats->tx_bytes   = vstats->tx_bytes;
-	stats->multicast  = vstats->rx_multicast_packets +
-			    vstats->tx_multicast_packets;
-	stats->tx_errors  = vstats->tx_error_packets;
-	stats->rx_errors  = vstats->rx_error_packets;
+
+#define PPCNT_GET_802_3_CTR(fld)                            \
+	(MLX5_GET64(eth_802_3_cntrs_grp_data_layout,        \
+			pstats->IEEE_802_3_counters, fld##_high))
+
+#define PPCNT_GET_2863_CTR(fld)                             \
+	(MLX5_GET64(eth_2863_cntrs_grp_data_layout,         \
+			pstats->RFC_2863_counters, fld##_high))
+
+	stats->rx_dropped = priv->stats.qcnt.rx_out_of_buffer;
 	stats->tx_dropped = vstats->tx_queue_dropped;
-	stats->rx_crc_errors = 0;
-	stats->rx_length_errors = 0;
+
+	stats->rx_length_errors =
+		PPCNT_GET_802_3_CTR(a_in_range_length_errors) +
+		PPCNT_GET_802_3_CTR(a_out_of_range_length_field) +
+		PPCNT_GET_802_3_CTR(a_frame_too_long_errors);
+	stats->rx_crc_errors =
+		PPCNT_GET_802_3_CTR(a_frame_check_sequence_errors);
+	stats->rx_frame_errors =
+		PPCNT_GET_802_3_CTR(a_alignment_errors);
+	stats->tx_aborted_errors =
+		PPCNT_GET_2863_CTR(if_out_discards);
+	stats->tx_carrier_errors =
+		PPCNT_GET_802_3_CTR(a_symbol_error_during_carrier);
+	stats->rx_errors = stats->rx_length_errors + stats->rx_crc_errors +
+			   stats->rx_frame_errors;
+	stats->tx_errors = stats->tx_aborted_errors + stats->tx_carrier_errors;
+
+	/* vport multicast also counts packets that are dropped due to steering
+	 * or rx out of buffer
+	 */
+	stats->multicast = vstats->rx_multicast_packets;
+
 
 	return stats;
 }
-- 
1.7.1

  reply	other threads:[~2016-04-22 19:02 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-22 19:00 [PATCH net-next 00/12] Mellanox 100G extending mlx5 ethtool support Saeed Mahameed
2016-04-22 19:00 ` Saeed Mahameed [this message]
2016-04-22 19:00 ` [PATCH net-next 02/12] net/mlx5e: Statistics handling refactoring Saeed Mahameed
2016-04-25 10:58   ` David Laight
2016-04-25 12:12     ` Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 03/12] net/mlx5e: Rename VPort counters Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 04/12] net/mlx5e: Add per priority group to PPort counters Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 05/12] net/mlx5e: Add link down events counter Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 06/12] net/mlx5e: Improve set features ndo resiliency Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 07/12] net/mlx5e: Add support for RXALL netdev feature Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 08/12] net/mlx5e: Add ethtool support for interface identify (LED blinking) Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 09/12] net/mlx5e: Add ethtool support for dump module EEPROM Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 10/12] net/mlx5e: Add ethtool support for rxvlan-offload (vlan stripping) Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 11/12] net/mlx5e: Fix checksum handling for non-stripped vlan packets Saeed Mahameed
2016-04-22 19:00 ` [PATCH net-next 12/12] net/mlx5e: Disable link up on INIT HCA command Saeed Mahameed
2016-04-23 16:00   ` Ido Schimmel
2016-04-23 20:21     ` Saeed Mahameed
2016-04-23 20:28       ` Or Gerlitz
2016-04-23 21:24         ` Saeed Mahameed
2016-04-23 21:28           ` Or Gerlitz
2016-04-23 22:03       ` Ido Schimmel

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=1461351647-27412-2-git-send-email-saeedm@mellanox.com \
    --to=saeedm@mellanox.com \
    --cc=davem@davemloft.net \
    --cc=eranbe@mellanox.com \
    --cc=galp@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=ogerlitz@mellanox.com \
    --cc=talal@mellanox.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).