Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a188f568 authored by Bodong Wang's avatar Bodong Wang Committed by Greg Kroah-Hartman
Browse files

Revert "net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager" 



[ Upstream commit 4e046de0f50e04acd48eb373d6a9061ddf014e0c ]

This reverts commit 5f5991f3.

With the original commit, eswitch instance will not be initialized for
a function which is vport group manager but not eswitch manager such as
host PF on SmartNIC (BlueField) card. This will result in a kernel crash
when such a vport group manager is trying to access vports in its group.
E.g, PF vport manager (not eswitch manager) tries to configure the MAC
of its VF vport, a kernel trace will happen similar as bellow:

 BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
 ...
 RIP: 0010:mlx5_eswitch_get_vport_config+0xc/0x180 [mlx5_core]
 ...

Fixes: 5f5991f3 ("net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager")
Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Reported-by: default avatarYuval Avnery <yuvalav@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 505e5f3d

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

+2 −2
Original line number Diff line number Diff line
@@ -1689,7 +1689,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	int vport_num;

	int err;



	if (!MLX5_ESWITCH_MANAGER(dev))

	if (!MLX5_VPORT_MANAGER(dev))

		return 0;



	esw_info(dev,
@@ -1758,7 +1758,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 


void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)

{

	if (!esw || !MLX5_ESWITCH_MANAGER(esw->dev))

	if (!esw || !MLX5_VPORT_MANAGER(esw->dev))

		return;



	esw_info(esw->dev, "cleanup\n");