net/mlx5e: Use a barrier after updating txq2sq

mlx5e_build_txq_maps updates txq2sq while TX queues are stopped. Add a
barrier to ensure that these changes are visible before the queues are
started and mlx5e_xmit reads from txq2sq.

This commit handles regular TX queues. Synchronization between HTB TX
queues and mlx5e_xmit is handled in the following commit.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d84d9cdbdbd419d0a039654399c7b7acaa731b4e..e64c3cb15ef6d1cc0ba6530d57b8b5ea21dfec02 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2688,10 +2688,10 @@ static void mlx5e_build_txq_maps(struct mlx5e_priv *priv)
        }
 
        if (!priv->channels.ptp)
-               return;
+               goto out;
 
        if (!test_bit(MLX5E_PTP_STATE_TX, priv->channels.ptp->state))
-               return;
+               goto out;
 
        for (tc = 0; tc < num_tc; tc++) {
                struct mlx5e_ptp *c = priv->channels.ptp;
@@ -2700,6 +2700,13 @@ static void mlx5e_build_txq_maps(struct mlx5e_priv *priv)
                priv->txq2sq[sq->txq_ix] = sq;
                priv->port_ptp_tc2realtxq[tc] = priv->num_tc_x_num_ch + tc;
        }
+
+out:
+       /* Make the change to txq2sq visible before the queue is started.
+        * As mlx5e_xmit runs under a spinlock, there is an implicit ACQUIRE,
+        * which pairs with this barrier.
+        */
+       smp_wmb();
 }
 
 static void mlx5e_update_num_tc_x_num_ch(struct mlx5e_priv *priv)