Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b832d4fd authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: Reuse fold sw stats in representors 



Representors software stats are basic, this patch is reusing the
mlx5e_fold_sw_stats in representors, which sums up the basic stats64 for a
mlx5e netdevice.

Fixes: 8bfaf07f ("net/mlx5e: Present SW stats when state is not opened")
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 168af00a

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 


void mlx5e_update_stats(struct mlx5e_priv *priv);

void mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);

void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s);



void mlx5e_init_l2_addr(struct mlx5e_priv *priv);

int mlx5e_self_test_num(struct mlx5e_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -3521,7 +3521,7 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	}

}



static void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s)

void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s)

{

	int i;

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

+8 −26
Original line number Diff line number Diff line
@@ -162,25 +162,16 @@ static void mlx5e_rep_update_hw_counters(struct mlx5e_priv *priv) 
static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv)

{

	struct mlx5e_sw_stats *s = &priv->stats.sw;

	int i, j;

	struct rtnl_link_stats64 stats64 = {};



	memset(s, 0, sizeof(*s));

	for (i = 0; i < mlx5e_get_netdev_max_channels(priv->netdev); i++) {

		struct mlx5e_channel_stats *channel_stats =

			&priv->channel_stats[i];

		struct mlx5e_rq_stats *rq_stats = &channel_stats->rq;



		s->rx_packets	+= rq_stats->packets;

		s->rx_bytes	+= rq_stats->bytes;



		for (j = 0; j < priv->max_opened_tc; j++) {

			struct mlx5e_sq_stats *sq_stats = &channel_stats->sq[j];

	mlx5e_fold_sw_stats64(priv, &stats64);



			s->tx_packets		+= sq_stats->packets;

			s->tx_bytes		+= sq_stats->bytes;

			s->tx_queue_dropped	+= sq_stats->dropped;

		}

	}

	s->rx_packets = stats64.rx_packets;

	s->rx_bytes   = stats64.rx_bytes;

	s->tx_packets = stats64.tx_packets;

	s->tx_bytes   = stats64.tx_bytes;

	s->tx_queue_dropped = stats64.tx_dropped;

}



static void mlx5e_rep_get_ethtool_stats(struct net_device *dev,
@@ -1226,17 +1217,8 @@ mlx5e_get_sw_stats64(const struct net_device *dev, 
		     struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_sw_stats *sstats = &priv->stats.sw;



	mlx5e_rep_update_sw_counters(priv);



	stats->rx_packets = sstats->rx_packets;

	stats->rx_bytes   = sstats->rx_bytes;

	stats->tx_packets = sstats->tx_packets;

	stats->tx_bytes   = sstats->tx_bytes;



	stats->tx_dropped = sstats->tx_queue_dropped;



	mlx5e_fold_sw_stats64(priv, stats);

	return 0;

}