Commit 8deeefb2 authored by Gavin Li's avatar Gavin Li Committed by Saeed Mahameed
Browse files

Revert "net/mlx5: Block entering switchdev mode with ns inconsistency" 



This reverts commit 662404b2.
The revert is required due to the suspicion it is not good for anything
and cause crash.

Fixes: 662404b2 ("net/mlx5e: Block entering switchdev mode with ns inconsistency")
Signed-off-by: default avatarGavin Li <gavinl@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 1c61728b

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

+0 −23
Original line number Diff line number Diff line
@@ -3658,22 +3658,6 @@ static int esw_inline_mode_to_devlink(u8 mlx5_mode, u8 *mode) 
	return 0;

}



static bool esw_offloads_devlink_ns_eq_netdev_ns(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct net *devl_net, *netdev_net;

	bool ret = false;



	mutex_lock(&dev->mlx5e_res.uplink_netdev_lock);

	if (dev->mlx5e_res.uplink_netdev) {

		netdev_net = dev_net(dev->mlx5e_res.uplink_netdev);

		devl_net = devlink_net(devlink);

		ret = net_eq(devl_net, netdev_net);

	}

	mutex_unlock(&dev->mlx5e_res.uplink_netdev_lock);

	return ret;

}



int mlx5_eswitch_block_mode(struct mlx5_core_dev *dev)

{

	struct mlx5_eswitch *esw = dev->priv.eswitch;
@@ -3718,13 +3702,6 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, 
	if (esw_mode_from_devlink(mode, &mlx5_mode))

		return -EINVAL;



	if (mode == DEVLINK_ESWITCH_MODE_SWITCHDEV &&

	    !esw_offloads_devlink_ns_eq_netdev_ns(devlink)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Can't change E-Switch mode to switchdev when netdev net namespace has diverged from the devlink's.");

		return -EPERM;

	}



	mlx5_lag_disable_change(esw->dev);

	err = mlx5_esw_try_lock(esw);

	if (err < 0) {