Re: [RFC net-next v4 1/2] net/mlx5e: Add txq to sq stats mapping

Tariq Toukan
2024-06-06T20:13:57Z

On 04/06/2024 3:46, Joe Damato wrote:
> mlx5 currently maps txqs to an sq via priv->txq2sq. It is useful to map
> txqs to sq_stats, as well, for direct access to stats.
>
> Add priv->txq2sq_stats and insert mappings. The mappings will be used
> next to tabulate stats information.
>
> Signed-off-by: Joe Damato <jdamato@fastly.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 ++
> drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 13 +++++++++++--
> drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 ++++++++++-
> 3 files changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
> index e85fb71bf0b4..4ae3eee3940c 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
> @@ -885,6 +885,8 @@ struct mlx5e_priv {
> /* priv data path fields - start */
> struct mlx5e_selq selq;
> struct mlx5e_txqsq **txq2sq;
> + struct mlx5e_sq_stats **txq2sq_stats;
> +
> #ifdef CONFIG_MLX5_CORE_EN_DCB
> struct mlx5e_dcbx_dp dcbx_dp;
> #endif
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
> index 6743806b8480..e89272a5d036 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
> @@ -170,6 +170,7 @@ int mlx5e_activate_qos_sq(void *data, u16 node_qid, u32 hw_id)
> mlx5e_tx_disable_queue(netdev_get_tx_queue(priv->netdev, qid));
>
> priv->txq2sq[qid] = sq;
> + priv->txq2sq_stats[qid] = sq->stats;
>
> /* Make the change to txq2sq visible before the queue is started.
> * As mlx5e_xmit runs under a spinlock, there is an implicit ACQUIRE,
> @@ -186,6 +187,7 @@ int mlx5e_activate_qos_sq(void *data, u16 node_qid, u32 hw_id)
> void mlx5e_deactivate_qos_sq(struct mlx5e_priv *priv, u16 qid)
> {
> struct mlx5e_txqsq *sq;
> + u16 mlx5e_qid;

Do not use mlx5 in variables names.

>
> sq = mlx5e_get_qos_sq(priv, qid);
> if (!sq) /* Handle the case when the SQ failed to open. */
> @@ -194,7 +196,10 @@ void mlx5e_deactivate_qos_sq(struct mlx5e_priv *priv, u16 qid)
> qos_dbg(sq->mdev, "Deactivate QoS SQ qid %u\n", qid);
> mlx5e_deactivate_txqsq(sq);
>
> - priv->txq2sq[mlx5e_qid_from_qos(&priv->channels, qid)] = NULL;
> + mlx5e_qid = mlx5e_qid_from_qos(&priv->channels, qid);
> +
> + priv->txq2sq[mlx5e_qid] = NULL;
> + priv->txq2sq_stats[mlx5e_qid] = NULL;
>
> /* Make the change to txq2sq visible before the queue is started again.
> * As mlx5e_xmit runs under a spinlock, there is an implicit ACQUIRE,
> @@ -325,6 +330,7 @@ void mlx5e_qos_deactivate_queues(struct mlx5e_channel *c)
> {
> struct mlx5e_params *params = &c->priv->channels.params;
> struct mlx5e_txqsq __rcu **qos_sqs;
> + u16 mlx5e_qid;
> int i;
>
> qos_sqs = mlx5e_state_dereference(c->priv, c->qos_sqs);
> @@ -342,8 +348,11 @@ void mlx5e_qos_deactivate_queues(struct mlx5e_channel *c)
> qos_dbg(c->mdev, "Deactivate QoS SQ qid %u\n", qid);
> mlx5e_deactivate_txqsq(sq);
>
> + mlx5e_qid = mlx5e_qid_from_qos(&c->priv->channels, qid);
> +
> /* The queue is disabled, no synchronization with datapath is needed. */
> - c->priv->txq2sq[mlx5e_qid_from_qos(&c->priv->channels, qid)] = NULL;
> + c->priv->txq2sq[mlx5e_qid] = NULL;
> + c->priv->txq2sq_stats[mlx5e_qid] = NULL;
> }
> }
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> index c53c99dde558..d03fd1c98eb6 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@ -3111,6 +3111,7 @@ static void mlx5e_build_txq_maps(struct mlx5e_priv *priv)
> struct mlx5e_txqsq *sq = &c->sq[tc];
>
> priv->txq2sq[sq->txq_ix] = sq;
> + priv->txq2sq_stats[sq->txq_ix] = sq->stats;
> }
> }
>
> @@ -3125,6 +3126,7 @@ static void mlx5e_build_txq_maps(struct mlx5e_priv *priv)
> struct mlx5e_txqsq *sq = &c->ptpsq[tc].txqsq;
>
> priv->txq2sq[sq->txq_ix] = sq;
> + priv->txq2sq_stats[sq->txq_ix] = sq->stats;
> }
>
> out:
> @@ -5824,9 +5826,13 @@ int mlx5e_priv_init(struct mlx5e_priv *priv,
> if (!priv->txq2sq)
> goto err_destroy_workqueue;
>
> + priv->txq2sq_stats = kcalloc_node(num_txqs, sizeof(*priv->txq2sq_stats), GFP_KERNEL, node);
> + if (!priv->txq2sq_stats)
> + goto err_free_txq2sq;
> +
> priv->tx_rates = kcalloc_node(num_txqs, sizeof(*priv->tx_rates), GFP_KERNEL, node);
> if (!priv->tx_rates)
> - goto err_free_txq2sq;
> + goto err_free_txq2sq_stats;
>
> priv->channel_stats =
> kcalloc_node(nch, sizeof(*priv->channel_stats), GFP_KERNEL, node);
> @@ -5837,6 +5843,8 @@ int mlx5e_priv_init(struct mlx5e_priv *priv,
>
> err_free_tx_rates:
> kfree(priv->tx_rates);
> +err_free_txq2sq_stats:
> + kfree(priv->txq2sq_stats);
> err_free_txq2sq:
> kfree(priv->txq2sq);
> err_destroy_workqueue:
> @@ -5860,6 +5868,7 @@ void mlx5e_priv_cleanup(struct mlx5e_priv *priv)
> kvfree(priv->channel_stats[i]);
> kfree(priv->channel_stats);
> kfree(priv->tx_rates);
> + kfree(priv->txq2sq_stats);
> kfree(priv->txq2sq);
> destroy_workqueue(priv->wq);
> mlx5e_selq_cleanup(&priv->selq);