Commit 102c47bc authored Oct 26, 2022 by Suresh Devarakonda Committed by Lipeng Sang May 23, 2023

net/mlx5: Fix crash during sync firmware reset

stable inclusion
from stable-v5.10.153
commit fdba224ab02873a2998acf9d11ae5ac9a1e35717
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCA

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



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

[ Upstream commit aefb62a9 ]

When setting Bluefield to DPU NIC mode using mlxconfig tool +  sync
firmware reset flow, we run into scenario where the host was not
eswitch manager at the time of mlx5 driver load but becomes eswitch manager
after the sync firmware reset flow. This results in null pointer
access of mpfs structure during mac filter add. This change prevents null
pointer access but mpfs table entries will not be added.

Fixes: 5ec69744 ("net/mlx5: Add support for devlink reload action fw activate")
Signed-off-by: Suresh Devarakonda <ramad@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Bodong Wang <bodong@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20221026135153.154807-12-saeed@kernel.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Lipeng Sang <sanglipeng1@jd.com>

parent 15fec526

drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev)
		{
		struct mlx5_mpfs *mpfs = dev->priv.mpfs;

		if (!MLX5_ESWITCH_MANAGER(dev))
		if (!mpfs)
		return;

		WARN_ON(!hlist_empty(mpfs->hash));
		@@ -137,7 +137,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev dev, u8 mac)
		int err = 0;
		u32 index;

		if (!MLX5_ESWITCH_MANAGER(dev))
		if (!mpfs)
		return 0;

		mutex_lock(&mpfs->lock);
		@@ -185,7 +185,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev dev, u8 mac)
		int err = 0;
		u32 index;

		if (!MLX5_ESWITCH_MANAGER(dev))
		if (!mpfs)
		return 0;

		mutex_lock(&mpfs->lock);