Commit 476681f1 authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

net/mlx5e: Account for netdev stats in ndo_get_stats64 



The driver's ndo_get_stats64 callback is only reporting mlx5 counters,
without accounting for the netdev stats, causing errors from the network
stack to be invisible in statistics.

Add netdev_stats_to_stats64() call to first populate the counters, then
add mlx5 counters on top, ensuring both are accounted for (where
appropriate).

Fixes: f62b8bb8 ("net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality")
Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1769411695-18820-4-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f6766693

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+11 −9
Original line number Diff line number Diff line
@@ -4052,6 +4052,8 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
		mlx5e_queue_update_stats(priv);

	}



	netdev_stats_to_stats64(stats, &dev->stats);



	if (mlx5e_is_uplink_rep(priv)) {

		struct mlx5e_vport_stats *vstats = &priv->stats.vport;
@@ -4068,21 +4070,21 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
		mlx5e_fold_sw_stats64(priv, stats);

	}



	stats->rx_missed_errors = priv->stats.qcnt.rx_out_of_buffer;

	stats->rx_dropped = PPORT_2863_GET(pstats, if_in_discards);

	stats->rx_missed_errors += priv->stats.qcnt.rx_out_of_buffer;

	stats->rx_dropped += PPORT_2863_GET(pstats, if_in_discards);



	stats->rx_length_errors =

	stats->rx_length_errors +=

		PPORT_802_3_GET(pstats, a_in_range_length_errors) +

		PPORT_802_3_GET(pstats, a_out_of_range_length_field) +

		PPORT_802_3_GET(pstats, a_frame_too_long_errors) +

		VNIC_ENV_GET(&priv->stats.vnic, eth_wqe_too_small);

	stats->rx_crc_errors =

	stats->rx_crc_errors +=

		PPORT_802_3_GET(pstats, a_frame_check_sequence_errors);

	stats->rx_frame_errors = PPORT_802_3_GET(pstats, a_alignment_errors);

	stats->tx_aborted_errors = PPORT_2863_GET(pstats, if_out_discards);

	stats->rx_errors = stats->rx_length_errors + stats->rx_crc_errors +

	stats->rx_frame_errors += PPORT_802_3_GET(pstats, a_alignment_errors);

	stats->tx_aborted_errors += PPORT_2863_GET(pstats, if_out_discards);

	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;

	stats->tx_errors += stats->tx_aborted_errors + stats->tx_carrier_errors;

}



static void mlx5e_nic_set_rx_mode(struct mlx5e_priv *priv)