net/mlx5: Move eswitch port metadata devlink param to flow eswitch code

Move the param registration and handling code into the eswitch offloads
code as they are related to each other. No point in having the
devlink param registration done in separate file.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 5918c8c..95a6954 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -432,49 +432,6 @@ static int mlx5_devlink_large_group_num_validate(struct devlink *devlink, u32 id
        return 0;
 }
 
-static int mlx5_devlink_esw_port_metadata_set(struct devlink *devlink, u32 id,
-                                             struct devlink_param_gset_ctx *ctx)
-{
-       struct mlx5_core_dev *dev = devlink_priv(devlink);
-
-       if (!MLX5_ESWITCH_MANAGER(dev))
-               return -EOPNOTSUPP;
-
-       return mlx5_esw_offloads_vport_metadata_set(dev->priv.eswitch, ctx->val.vbool);
-}
-
-static int mlx5_devlink_esw_port_metadata_get(struct devlink *devlink, u32 id,
-                                             struct devlink_param_gset_ctx *ctx)
-{
-       struct mlx5_core_dev *dev = devlink_priv(devlink);
-
-       if (!MLX5_ESWITCH_MANAGER(dev))
-               return -EOPNOTSUPP;
-
-       ctx->val.vbool = mlx5_eswitch_vport_match_metadata_enabled(dev->priv.eswitch);
-       return 0;
-}
-
-static int mlx5_devlink_esw_port_metadata_validate(struct devlink *devlink, u32 id,
-                                                  union devlink_param_value val,
-                                                  struct netlink_ext_ack *extack)
-{
-       struct mlx5_core_dev *dev = devlink_priv(devlink);
-       u8 esw_mode;
-
-       if (!MLX5_ESWITCH_MANAGER(dev)) {
-               NL_SET_ERR_MSG_MOD(extack, "E-Switch is unsupported");
-               return -EOPNOTSUPP;
-       }
-       esw_mode = mlx5_eswitch_mode(dev);
-       if (esw_mode == MLX5_ESWITCH_OFFLOADS) {
-               NL_SET_ERR_MSG_MOD(extack,
-                                  "E-Switch must either disabled or non switchdev mode");
-               return -EBUSY;
-       }
-       return 0;
-}
-
 #endif
 
 static int mlx5_devlink_eq_depth_validate(struct devlink *devlink, u32 id,
@@ -493,12 +450,6 @@ static const struct devlink_param mlx5_devlink_params[] = {
                             BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
                             NULL, NULL,
                             mlx5_devlink_large_group_num_validate),
-       DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,
-                            "esw_port_metadata", DEVLINK_PARAM_TYPE_BOOL,
-                            BIT(DEVLINK_PARAM_CMODE_RUNTIME),
-                            mlx5_devlink_esw_port_metadata_get,
-                            mlx5_devlink_esw_port_metadata_set,
-                            mlx5_devlink_esw_port_metadata_validate),
 #endif
        DEVLINK_PARAM_GENERIC(IO_EQ_SIZE, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
                              NULL, NULL, mlx5_devlink_eq_depth_validate),

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 0be01d7..0f05251 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1640,7 +1640,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
        if (err)
                goto abort;
 
-       err = esw_offloads_init_reps(esw);
+       err = esw_offloads_init(esw);
        if (err)
                goto reps_err;
 
@@ -1706,7 +1706,7 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
        mlx5e_mod_hdr_tbl_destroy(&esw->offloads.mod_hdr);
        mutex_destroy(&esw->offloads.encap_tbl_lock);
        mutex_destroy(&esw->offloads.decap_tbl_lock);
-       esw_offloads_cleanup_reps(esw);
+       esw_offloads_cleanup(esw);
        mlx5_esw_vports_cleanup(esw);
        kfree(esw);
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 92644fb..5b5a215 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -346,8 +346,8 @@ struct mlx5_eswitch {
 
 void esw_offloads_disable(struct mlx5_eswitch *esw);
 int esw_offloads_enable(struct mlx5_eswitch *esw);
-void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw);
-int esw_offloads_init_reps(struct mlx5_eswitch *esw);
+void esw_offloads_cleanup(struct mlx5_eswitch *esw);
+int esw_offloads_init(struct mlx5_eswitch *esw);
 
 struct mlx5_flow_handle *
 mlx5_eswitch_add_send_to_vport_meta_rule(struct mlx5_eswitch *esw, u16 vport_num);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 5fb9d5e..3a82e38 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -2403,7 +2403,7 @@ static void mlx5_esw_offloads_rep_cleanup(struct mlx5_eswitch *esw,
        kfree(rep);
 }
 
-void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw)
+static void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw)
 {
        struct mlx5_eswitch_rep *rep;
        unsigned long i;
@@ -2413,7 +2413,7 @@ void esw_offloads_cleanup_reps(struct mlx5_eswitch *esw)
        xa_destroy(&esw->offloads.vport_reps);
 }
 
-int esw_offloads_init_reps(struct mlx5_eswitch *esw)
+static int esw_offloads_init_reps(struct mlx5_eswitch *esw)
 {
        struct mlx5_vport *vport;
        unsigned long i;
@@ -2433,6 +2433,94 @@ err:
        return err;
 }
 
+static int esw_port_metadata_set(struct devlink *devlink, u32 id,
+                                struct devlink_param_gset_ctx *ctx)
+{
+       struct mlx5_core_dev *dev = devlink_priv(devlink);
+       struct mlx5_eswitch *esw = dev->priv.eswitch;
+       int err = 0;
+
+       down_write(&esw->mode_lock);
+       if (mlx5_esw_is_fdb_created(esw)) {
+               err = -EBUSY;
+               goto done;
+       }
+       if (!mlx5_esw_vport_match_metadata_supported(esw)) {
+               err = -EOPNOTSUPP;
+               goto done;
+       }
+       if (ctx->val.vbool)
+               esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;
+       else
+               esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;
+done:
+       up_write(&esw->mode_lock);
+       return err;
+}
+
+static int esw_port_metadata_get(struct devlink *devlink, u32 id,
+                                struct devlink_param_gset_ctx *ctx)
+{
+       struct mlx5_core_dev *dev = devlink_priv(devlink);
+
+       ctx->val.vbool = mlx5_eswitch_vport_match_metadata_enabled(dev->priv.eswitch);
+       return 0;
+}
+
+static int esw_port_metadata_validate(struct devlink *devlink, u32 id,
+                                     union devlink_param_value val,
+                                     struct netlink_ext_ack *extack)
+{
+       struct mlx5_core_dev *dev = devlink_priv(devlink);
+       u8 esw_mode;
+
+       esw_mode = mlx5_eswitch_mode(dev);
+       if (esw_mode == MLX5_ESWITCH_OFFLOADS) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "E-Switch must either disabled or non switchdev mode");
+               return -EBUSY;
+       }
+       return 0;
+}
+
+static const struct devlink_param esw_devlink_params[] = {
+       DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,
+                            "esw_port_metadata", DEVLINK_PARAM_TYPE_BOOL,
+                            BIT(DEVLINK_PARAM_CMODE_RUNTIME),
+                            esw_port_metadata_get,
+                            esw_port_metadata_set,
+                            esw_port_metadata_validate),
+};
+
+int esw_offloads_init(struct mlx5_eswitch *esw)
+{
+       int err;
+
+       err = esw_offloads_init_reps(esw);
+       if (err)
+               return err;
+
+       err = devl_params_register(priv_to_devlink(esw->dev),
+                                  esw_devlink_params,
+                                  ARRAY_SIZE(esw_devlink_params));
+       if (err)
+               goto err_params;
+
+       return 0;
+
+err_params:
+       esw_offloads_cleanup_reps(esw);
+       return err;
+}
+
+void esw_offloads_cleanup(struct mlx5_eswitch *esw)
+{
+       devl_params_unregister(priv_to_devlink(esw->dev),
+                              esw_devlink_params,
+                              ARRAY_SIZE(esw_devlink_params));
+       esw_offloads_cleanup_reps(esw);
+}
+
 static void __esw_offloads_unload_rep(struct mlx5_eswitch *esw,
                                      struct mlx5_eswitch_rep *rep, u8 rep_type)
 {