svn commit: r347760 - stable/12/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 16:21:32 2019
New Revision: 347760
URL: https://svnweb.freebsd.org/changeset/base/347760

Log:
  MFC r347295:
  Let rx_out_of_buffer be a 32-bit counter in mlx5en(4).
  
  This fixes counting issues when the firmware resets the counter during
  allocation of the counter set where the counter belongs.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_en/en.h
  stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/en.h	Thu May 16 16:15:41 2019	(r347759)
+++ stable/12/sys/dev/mlx5/mlx5_en/en.h	Thu May 16 16:21:32 2019	(r347760)
@@ -195,7 +195,6 @@ struct mlx5e_vport_stats {
 	struct	sysctl_ctx_list ctx;
 	u64	arg [0];
 	MLX5E_VPORT_STATS(MLX5E_STATS_VAR)
-	u32	rx_out_of_buffer_prev;
 };
 
 #define	MLX5E_PPORT_IEEE802_3_STATS(m)					\

Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Thu May 16 16:15:41 2019	(r347759)
+++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Thu May 16 16:21:32 2019	(r347760)
@@ -593,10 +593,7 @@ mlx5e_update_stats_locked(struct mlx5e_priv *priv)
 	if (test_bit(MLX5E_STATE_OPENED, &priv->state) != 0 &&
 	    mlx5_vport_query_out_of_rx_buffer(mdev, priv->counter_set_id,
 	    &rx_out_of_buffer) == 0) {
-		/* accumulate difference into a 64-bit counter */
-		s->rx_out_of_buffer += (u64)(u32)(rx_out_of_buffer -
-		    s->rx_out_of_buffer_prev);
-		s->rx_out_of_buffer_prev = rx_out_of_buffer;
+		s->rx_out_of_buffer = rx_out_of_buffer;
 	}
 
 	/* get port statistics */