Commit a184cda1 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Update statistics to new cmd interface 



Do mass update of statistics to reuse newly introduced
mlx5_cmd_exec_in*() interfaces.

Reviewed-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 49d7fcd1

drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c

+14 −32
Original line number Diff line number Diff line
@@ -39,11 +39,10 @@ int mlx5e_monitor_counter_supported(struct mlx5e_priv *priv) 
void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv)

{

	u32 in[MLX5_ST_SZ_DW(arm_monitor_counter_in)] = {};

	u32 out[MLX5_ST_SZ_DW(arm_monitor_counter_out)] = {};



	MLX5_SET(arm_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_ARM_MONITOR_COUNTER);

	mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(priv->mdev, arm_monitor_counter, in);

}



static void mlx5e_monitor_counters_work(struct work_struct *work)
@@ -66,19 +65,6 @@ static int mlx5e_monitor_event_handler(struct notifier_block *nb, 
	return NOTIFY_OK;

}



static void mlx5e_monitor_counter_start(struct mlx5e_priv *priv)

{

	MLX5_NB_INIT(&priv->monitor_counters_nb, mlx5e_monitor_event_handler,

		     MONITOR_COUNTER);

	mlx5_eq_notifier_register(priv->mdev, &priv->monitor_counters_nb);

}



static void mlx5e_monitor_counter_stop(struct mlx5e_priv *priv)

{

	mlx5_eq_notifier_unregister(priv->mdev, &priv->monitor_counters_nb);

	cancel_work_sync(&priv->monitor_counters_work);

}



static int fill_monitor_counter_ppcnt_set1(int cnt, u32 *in)

{

	enum mlx5_monitor_counter_ppcnt ppcnt_cnt;
@@ -119,7 +105,6 @@ static void mlx5e_set_monitor_counter(struct mlx5e_priv *priv) 
	int num_ppcnt_counters  = !MLX5_CAP_PCAM_REG(mdev, ppcnt) ? 0 :

				  MLX5_CAP_GEN(mdev, num_ppcnt_monitor_counters);

	u32 in[MLX5_ST_SZ_DW(set_monitor_counter_in)] = {};

	u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {};

	int q_counter = priv->q_counter;

	int cnt	= 0;
@@ -136,34 +121,31 @@ static void mlx5e_set_monitor_counter(struct mlx5e_priv *priv) 
	MLX5_SET(set_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_SET_MONITOR_COUNTER);



	mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(mdev, set_monitor_counter, in);

}



/* check if mlx5e_monitor_counter_supported before calling this function*/

void mlx5e_monitor_counter_init(struct mlx5e_priv *priv)

{

	INIT_WORK(&priv->monitor_counters_work, mlx5e_monitor_counters_work);

	mlx5e_monitor_counter_start(priv);

	MLX5_NB_INIT(&priv->monitor_counters_nb, mlx5e_monitor_event_handler,

		     MONITOR_COUNTER);

	mlx5_eq_notifier_register(priv->mdev, &priv->monitor_counters_nb);



	mlx5e_set_monitor_counter(priv);

	mlx5e_monitor_counter_arm(priv);

	queue_work(priv->wq, &priv->update_stats_work);

}



static void mlx5e_monitor_counter_disable(struct mlx5e_priv *priv)

/* check if mlx5e_monitor_counter_supported before calling this function*/

void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv)

{

	u32 in[MLX5_ST_SZ_DW(set_monitor_counter_in)] = {};

	u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {};



	MLX5_SET(set_monitor_counter_in, in, num_of_counters, 0);

	MLX5_SET(set_monitor_counter_in, in, opcode,

		 MLX5_CMD_OP_SET_MONITOR_COUNTER);



	mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out));

}



/* check if mlx5e_monitor_counter_supported before calling this function*/

void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv)

{

	mlx5e_monitor_counter_disable(priv);

	mlx5e_monitor_counter_stop(priv);

	mlx5_cmd_exec_in(priv->mdev, set_monitor_counter, in);

	mlx5_eq_notifier_unregister(priv->mdev, &priv->monitor_counters_nb);

	cancel_work_sync(&priv->monitor_counters_work);

}

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

+5 −12
Original line number Diff line number Diff line
@@ -491,18 +491,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vnic_env) 
static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vnic_env)

{

	u32 *out = (u32 *)priv->stats.vnic.query_vnic_env_out;

	int outlen = MLX5_ST_SZ_BYTES(query_vnic_env_out);

	u32 in[MLX5_ST_SZ_DW(query_vnic_env_in)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_vnic_env_in)] = {};

	struct mlx5_core_dev *mdev = priv->mdev;



	if (!MLX5_CAP_GEN(priv->mdev, nic_receive_steering_discard))

		return;



	MLX5_SET(query_vnic_env_in, in, opcode,

		 MLX5_CMD_OP_QUERY_VNIC_ENV);

	MLX5_SET(query_vnic_env_in, in, op_mod, 0);

	MLX5_SET(query_vnic_env_in, in, other_vport, 0);

	mlx5_cmd_exec(mdev, in, sizeof(in), out, outlen);

	MLX5_SET(query_vnic_env_in, in, opcode, MLX5_CMD_OP_QUERY_VNIC_ENV);

	mlx5_cmd_exec_inout(mdev, query_vnic_env, in, out);

}



#define VPORT_COUNTER_OFF(c) MLX5_BYTE_OFF(query_vport_counter_out, c)
@@ -577,15 +573,12 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vport) 


static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport)

{

	int outlen = MLX5_ST_SZ_BYTES(query_vport_counter_out);

	u32 *out = (u32 *)priv->stats.vport.query_vport_out;

	u32 in[MLX5_ST_SZ_DW(query_vport_counter_in)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_vport_counter_in)] = {};

	struct mlx5_core_dev *mdev = priv->mdev;



	MLX5_SET(query_vport_counter_in, in, opcode, MLX5_CMD_OP_QUERY_VPORT_COUNTER);

	MLX5_SET(query_vport_counter_in, in, op_mod, 0);

	MLX5_SET(query_vport_counter_in, in, other_vport, 0);

	mlx5_cmd_exec(mdev, in, sizeof(in), out, outlen);

	mlx5_cmd_exec_inout(mdev, query_vport_counter, in, out);

}



#define PPORT_802_3_OFF(c) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE