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

Commit 3834a5e6 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Optimize update stats work 



Unlike ethtool stats, get_stats ndo provides information cached by
update stats work that is running in the background without updating
them explicitly.
We cannot update all counters inside the ndo because some
updates require firmware commands that cannot be performed under a
spinlock.

update_stats work does not need to update ALL counters, since only
some of them are needed by ndo_get_stats.
This patch will allow for a minimal run of update_stats using an extra
parameter which will update necessary counters only and cut 13
firmware commands in each iteration of the work.

Work duration previous to this patch: ~4200us.
Work duration after this patch: ~700us (17% of the original time).

Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Cc: kernel-team@fb.com
parent 432609a4

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

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ void mlx5e_rx_am(struct mlx5e_rq *rq); 
void mlx5e_rx_am_work(struct work_struct *work);

struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);



void mlx5e_update_stats(struct mlx5e_priv *priv);

void mlx5e_update_stats(struct mlx5e_priv *priv, bool full);



int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev, 


	mutex_lock(&priv->state_lock);

	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

		mlx5e_update_stats(priv);

		mlx5e_update_stats(priv, true);

	channels = &priv->channels;

	mutex_unlock(&priv->state_lock);

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

+14 −5
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void mlx5e_update_vport_counters(struct mlx5e_priv *priv) 
	mlx5_cmd_exec(mdev, in, sizeof(in), out, outlen);

}



static void mlx5e_update_pport_counters(struct mlx5e_priv *priv)

static void mlx5e_update_pport_counters(struct mlx5e_priv *priv, bool full)

{

	struct mlx5e_pport_stats *pstats = &priv->stats.pport;

	struct mlx5_core_dev *mdev = priv->mdev;
@@ -259,6 +259,9 @@ static void mlx5e_update_pport_counters(struct mlx5e_priv *priv) 
	MLX5_SET(ppcnt_reg, in, grp, MLX5_IEEE_802_3_COUNTERS_GROUP);

	mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0);



	if (!full)

		return;



	out = pstats->RFC_2863_counters;

	MLX5_SET(ppcnt_reg, in, grp, MLX5_RFC_2863_COUNTERS_GROUP);

	mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0);
@@ -318,15 +321,21 @@ static void mlx5e_update_pcie_counters(struct mlx5e_priv *priv) 
	mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_MPCNT, 0, 0);

}



void mlx5e_update_stats(struct mlx5e_priv *priv)

void mlx5e_update_stats(struct mlx5e_priv *priv, bool full)

{

	if (full)

		mlx5e_update_pcie_counters(priv);

	mlx5e_update_pport_counters(priv);

	mlx5e_update_pport_counters(priv, full);

	mlx5e_update_vport_counters(priv);

	mlx5e_update_q_counter(priv);

	mlx5e_update_sw_counters(priv);

}



static void mlx5e_update_ndo_stats(struct mlx5e_priv *priv)

{

	mlx5e_update_stats(priv, false);

}



void mlx5e_update_stats_work(struct work_struct *work)

{

	struct delayed_work *dwork = to_delayed_work(work);
@@ -4195,7 +4204,7 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.cleanup_tx	   = mlx5e_cleanup_nic_tx,

	.enable		   = mlx5e_nic_enable,

	.disable	   = mlx5e_nic_disable,

	.update_stats	   = mlx5e_update_stats,

	.update_stats	   = mlx5e_update_ndo_stats,

	.max_nch	   = mlx5e_get_max_num_channels,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq,