]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5e: Use net_prefetchw instead of prefetchw in MPWQE TX datapath
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Fri, 29 Jan 2021 16:43:31 +0000 (18:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:29:28 +0000 (10:29 +0200)
[ Upstream commit 991b2654605b455a94dac73e14b23480e7e20991 ]

Commit e20f0dbf204f ("net/mlx5e: RX, Add a prefetch command for small
L1_CACHE_BYTES") switched to using net_prefetchw at all places in mlx5e.
In the same time frame, commit 5af75c747e2a ("net/mlx5e: Enhanced TX
MPWQE for SKBs") added one more usage of prefetchw. When these two
changes were merged, this new occurrence of prefetchw wasn't replaced
with net_prefetchw.

This commit fixes this last occurrence of prefetchw in
mlx5e_tx_mpwqe_session_start, making the same change that was done in
mlx5e_xdp_mpwqe_session_start.

Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

index 61ed671fe741bd48b22d326dd36938fc99aac76d..1b3c93c3fd23c54188697785afde76cb68c3e9d1 100644 (file)
@@ -553,7 +553,7 @@ static void mlx5e_tx_mpwqe_session_start(struct mlx5e_txqsq *sq,
 
        pi = mlx5e_txqsq_get_next_pi(sq, MLX5E_TX_MPW_MAX_WQEBBS);
        wqe = MLX5E_TX_FETCH_WQE(sq, pi);
-       prefetchw(wqe->data);
+       net_prefetchw(wqe->data);
 
        *session = (struct mlx5e_tx_mpwqe) {
                .wqe = wqe,