Commit f25e7b82 authored by Joe Damato's avatar Joe Damato Committed by Jakub Kicinski
Browse files

net/mlx5e: link NAPI instances to queues and IRQs 



Make mlx5 compatible with the newly added netlink queue GET APIs.

Signed-off-by: default avatarJoe Damato <jdamato@fastly.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240209202312.30181-1-jdamato@fastly.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0f37666d

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

+4 −1
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ void mlx5e_ptp_activate_channel(struct mlx5e_ptp *c) 
	if (test_bit(MLX5E_PTP_STATE_RX, c->state)) {

		mlx5e_ptp_rx_set_fs(c->priv);

		mlx5e_activate_rq(&c->rq);

		netif_queue_set_napi(c->netdev, c->rq.ix, NETDEV_QUEUE_TYPE_RX, &c->napi);

	}

	mlx5e_trigger_napi_sched(&c->napi);

}
@@ -943,8 +944,10 @@ void mlx5e_ptp_deactivate_channel(struct mlx5e_ptp *c) 
{

	int tc;



	if (test_bit(MLX5E_PTP_STATE_RX, c->state))

	if (test_bit(MLX5E_PTP_STATE_RX, c->state)) {

		netif_queue_set_napi(c->netdev, c->rq.ix, NETDEV_QUEUE_TYPE_RX, NULL);

		mlx5e_deactivate_rq(&c->rq);

	}



	if (test_bit(MLX5E_PTP_STATE_TX, c->state)) {

		for (tc = 0; tc < c->num_tc; tc++)

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

+7 −0
Original line number Diff line number Diff line
@@ -1806,6 +1806,7 @@ void mlx5e_activate_txqsq(struct mlx5e_txqsq *sq) 
	set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);

	netdev_tx_reset_queue(sq->txq);

	netif_tx_start_queue(sq->txq);

	netif_queue_set_napi(sq->netdev, sq->txq_ix, NETDEV_QUEUE_TYPE_TX, sq->cq.napi);

}



void mlx5e_tx_disable_queue(struct netdev_queue *txq)
@@ -1819,6 +1820,7 @@ void mlx5e_deactivate_txqsq(struct mlx5e_txqsq *sq) 
{

	struct mlx5_wq_cyc *wq = &sq->wq;



	netif_queue_set_napi(sq->netdev, sq->txq_ix, NETDEV_QUEUE_TYPE_TX, NULL);

	clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);

	synchronize_net(); /* Sync with NAPI to prevent netif_tx_wake_queue. */
@@ -2560,6 +2562,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	c->lag_port = mlx5e_enumerate_lag_port(priv->mdev, ix);



	netif_napi_add(netdev, &c->napi, mlx5e_napi_poll);

	netif_napi_set_irq(&c->napi, irq);



	err = mlx5e_open_queues(c, params, cparam);

	if (unlikely(err))
@@ -2602,12 +2605,16 @@ static void mlx5e_activate_channel(struct mlx5e_channel *c) 
		mlx5e_activate_xsk(c);

	else

		mlx5e_activate_rq(&c->rq);



	netif_queue_set_napi(c->netdev, c->ix, NETDEV_QUEUE_TYPE_RX, &c->napi);

}



static void mlx5e_deactivate_channel(struct mlx5e_channel *c)

{

	int tc;



	netif_queue_set_napi(c->netdev, c->ix, NETDEV_QUEUE_TYPE_RX, NULL);



	if (test_bit(MLX5E_CHANNEL_STATE_XSK, c->state))

		mlx5e_deactivate_xsk(c);

	else