Commit be98737a authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Use dynamic per-channel allocations in stats 



Make stats array an array of pointer. This patch comes in to prepare for
the next patch where allocations of the stats are to be performed
dynamically on first usage.

Signed-off-by: default avatarLama Kayal <lkayal@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 473baf2e

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

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ struct mlx5e_priv { 
	struct net_device         *netdev;

	struct mlx5e_trap         *en_trap;

	struct mlx5e_stats         stats;

	struct mlx5e_channel_stats *channel_stats;

	struct mlx5e_channel_stats **channel_stats;

	struct mlx5e_channel_stats trap_stats;

	struct mlx5e_ptp_stats     ptp_stats;

	u16                        stats_nch;

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ mlx5e_hv_vhca_fill_ring_stats(struct mlx5e_priv *priv, int ch, 
	struct mlx5e_channel_stats *stats;

	int tc;



	stats = &priv->channel_stats[ch];

	stats = priv->channel_stats[ch];

	data->rx_packets = stats->rq.packets;

	data->rx_bytes   = stats->rq.bytes;

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int mlx5e_init_xsk_rq(struct mlx5e_channel *c, 
	rq->hw_mtu       = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	rq->xdpsq        = &c->rq_xdpsq;

	rq->xsk_pool     = pool;

	rq->stats        = &c->priv->channel_stats[c->ix].xskrq;

	rq->stats        = &c->priv->channel_stats[c->ix]->xskrq;

	rq->ptp_cyc2time = mlx5_rq_ts_translator(mdev);

	rq_xdp_ix        = c->ix + params->num_channels * MLX5E_RQ_GROUP_XSK;

	err = mlx5e_rq_set_handlers(rq, params, xsk);

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk, 
	priv_rx->rxq = rxq;

	priv_rx->sk = sk;



	priv_rx->rq_stats = &priv->channel_stats[rxq].rq;

	priv_rx->rq_stats = &priv->channel_stats[rxq]->rq;

	priv_rx->sw_stats = &priv->tls->sw_stats;

	mlx5e_set_ktls_rx_priv_ctx(tls_ctx, priv_rx);

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

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv, 
	rule = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		priv->channel_stats[arfs_rule->rxq].rq.arfs_err++;

		priv->channel_stats[arfs_rule->rxq]->rq.arfs_err++;

		mlx5e_dbg(HW, priv,

			  "%s: add rule(filter id=%d, rq idx=%d, ip proto=0x%x) failed,err=%d\n",

			  __func__, arfs_rule->filter_id, arfs_rule->rxq,