Commit 0a3e5c1b authored by Joe Damato's avatar Joe Damato Committed by David S. Miller
Browse files

net/mlx5e: Add txq to sq stats mapping 



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: default avatarJoe Damato <jdamato@fastly.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 934c2999

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

+2 −0
Original line number Diff line number Diff line
@@ -867,6 +867,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

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

+11 −2
Original line number Diff line number Diff line
@@ -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 txq_ix;



	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;

	txq_ix = mlx5e_qid_from_qos(&priv->channels, qid);



	priv->txq2sq[txq_ix] = NULL;

	priv->txq2sq_stats[txq_ix] = 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 txq_ix;

	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);



		txq_ix = 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[txq_ix] = NULL;

		c->priv->txq2sq_stats[txq_ix] = NULL;

	}

}

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

+10 −1
Original line number Diff line number Diff line
@@ -3125,6 +3125,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;

		}

	}
@@ -3139,6 +3140,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:
@@ -5848,9 +5850,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);
@@ -5861,6 +5867,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:
@@ -5884,6 +5892,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);