net/mlx5: Split eswitch mode check to different helper function

In order to check eswitch state under a lock, prepare code to split
capability check and eswitch state check into two helper functions.

Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Bodong Wang <bodong@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 088fb51123e27a3b4b1dc2ac541d5663de6deff9..53fcb00ddbac7f01886020e8089ece0659a0bd06 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -2506,13 +2506,18 @@ static int mlx5_eswitch_check(const struct mlx5_core_dev *dev)
        if(!MLX5_ESWITCH_MANAGER(dev))
                return -EPERM;
 
-       if (dev->priv.eswitch->mode == MLX5_ESWITCH_NONE &&
-           !mlx5_core_is_ecpf_esw_manager(dev))
-               return -EOPNOTSUPP;
-
        return 0;
 }
 
+static int eswitch_devlink_esw_mode_check(const struct mlx5_eswitch *esw)
+{
+       /* devlink commands in NONE eswitch mode are currently supported only
+        * on ECPF.
+        */
+       return (esw->mode == MLX5_ESWITCH_NONE &&
+               !mlx5_core_is_ecpf_esw_manager(esw->dev)) ? -EOPNOTSUPP : 0;
+}
+
 int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode,
                                  struct netlink_ext_ack *extack)
 {
@@ -2524,6 +2529,10 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode,
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(dev->priv.eswitch);
+       if (err)
+               return err;
+
        cur_mlx5_mode = dev->priv.eswitch->mode;
 
        if (esw_mode_from_devlink(mode, &mlx5_mode))
@@ -2549,6 +2558,10 @@ int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode)
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(dev->priv.eswitch);
+       if (err)
+               return err;
+
        return esw_mode_to_devlink(dev->priv.eswitch->mode, mode);
 }
 
@@ -2564,6 +2577,10 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode,
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(esw);
+       if (err)
+               return err;
+
        switch (MLX5_CAP_ETH(dev, wqe_inline_mode)) {
        case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:
                if (mode == DEVLINK_ESWITCH_INLINE_MODE_NONE)
@@ -2618,6 +2635,10 @@ int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode)
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(esw);
+       if (err)
+               return err;
+
        return esw_inline_mode_to_devlink(esw->offloads.inline_mode, mode);
 }
 
@@ -2633,6 +2654,10 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(esw);
+       if (err)
+               return err;
+
        if (encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE &&
            (!MLX5_CAP_ESW_FLOWTABLE_FDB(dev, reformat) ||
             !MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap)))
@@ -2682,6 +2707,10 @@ int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,
        if (err)
                return err;
 
+       err = eswitch_devlink_esw_mode_check(esw);
+       if (err)
+               return err;
+
        *encap = esw->offloads.encap;
        return 0;
 }