Revert "net/mlx5: Block entering switchdev mode with ns inconsistency"
authorGavin Li <gavinl@nvidia.com>
Thu, 19 Oct 2023 01:49:54 +0000 (04:49 +0300)
committerSaeed Mahameed <saeedm@nvidia.com>
Sat, 2 Mar 2024 07:02:25 +0000 (23:02 -0800)
This reverts commit 662404b24a4c4d839839ed25e3097571f5938b9b.
The revert is required due to the suspicion it is not good for anything
and cause crash.

Fixes: 662404b24a4c ("net/mlx5e: Block entering switchdev mode with ns inconsistency")
Signed-off-by: Gavin Li <gavinl@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

index b045513..14b3bd3 100644 (file)
@@ -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) {