[PATCH 4.14 11/46] Revert "net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager"

From: Greg Kroah-Hartman
Date: Mon Feb 04 2019 - 05:44:30 EST

4.14-stable review patch. If anyone has any objections, please let me know.


From: Bodong Wang <bodong@xxxxxxxxxxxx>

[ Upstream commit 4e046de0f50e04acd48eb373d6a9061ddf014e0c ]

This reverts commit 5f5991f36dce1e69dd8bd7495763eec2e28f08e7.

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: 5f5991f36dce ("net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager")
Signed-off-by: Bodong Wang <bodong@xxxxxxxxxxxx>
Reported-by: Yuval Avnery <yuvalav@xxxxxxxxxxxx>
Reviewed-by: Daniel Jurgens <danielj@xxxxxxxxxxxx>
Reviewed-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1607,7 +1607,7 @@ int mlx5_eswitch_init(struct mlx5_core_d
int vport_num;
int err;

+ if (!MLX5_VPORT_MANAGER(dev))
return 0;

@@ -1680,7 +1680,7 @@ abort:

void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
- if (!esw || !MLX5_ESWITCH_MANAGER(esw->dev))
+ if (!esw || !MLX5_VPORT_MANAGER(esw->dev))

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