Commit caccf4c3 authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Liu Jian
Browse files

net/mlx5e: Take state lock during tx timeout reporter 

stable inclusion
from stable-v6.6.48
commit b3b9a87adee97854bcd71057901d46943076267e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAQOI7
CVE: CVE-2024-45019

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b3b9a87adee97854bcd71057901d46943076267e



-------------------------------------------------

[ Upstream commit e6b5afd30b99b43682a7764e1a74a42fe4d5f4b3 ]

mlx5e_safe_reopen_channels() requires the state lock taken. The
referenced changed in the Fixes tag removed the lock to fix another
issue. This patch adds it back but at a later point (when calling
mlx5e_safe_reopen_channels()) to avoid the deadlock referenced in the
Fixes tag.

Fixes: eab0da38912e ("net/mlx5e: Fix possible deadlock on mlx5e_tx_timeout_work")
Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Link: https://lore.kernel.org/all/ZplpKq8FKi3vwfxv@gmail.com/T/


Reviewed-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20240808144107.2095424-4-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 7df4077a

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

+2 −0
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx) 
		return err;

	}



	mutex_lock(&priv->state_lock);

	err = mlx5e_safe_reopen_channels(priv);

	mutex_unlock(&priv->state_lock);

	if (!err) {

		to_ctx->status = 1; /* all channels recovered */

		return err;