mlxsw: spectrum: Move flow offload binding into spectrum_flow.c

Move the code taking case of setup of flow offload into spectrum_flow.c
Do small renaming of callbacks on the way.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index ceaf73ac20083e0b86a07aa96e4a528aa3ba68f8..f78bde8bc16eb1fbe073311b5868726cce72421e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1350,178 +1350,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev,
        return 0;
 }
 
-static int
-mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_flow_block *flow_block,
-                              struct tc_cls_matchall_offload *f)
-{
-       switch (f->command) {
-       case TC_CLSMATCHALL_REPLACE:
-               return mlxsw_sp_mall_replace(flow_block, f);
-       case TC_CLSMATCHALL_DESTROY:
-               mlxsw_sp_mall_destroy(flow_block, f);
-               return 0;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int
-mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_flow_block *flow_block,
-                            struct flow_cls_offload *f)
-{
-       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_flow_block_mlxsw_sp(flow_block);
-
-       switch (f->command) {
-       case FLOW_CLS_REPLACE:
-               return mlxsw_sp_flower_replace(mlxsw_sp, flow_block, f);
-       case FLOW_CLS_DESTROY:
-               mlxsw_sp_flower_destroy(mlxsw_sp, flow_block, f);
-               return 0;
-       case FLOW_CLS_STATS:
-               return mlxsw_sp_flower_stats(mlxsw_sp, flow_block, f);
-       case FLOW_CLS_TMPLT_CREATE:
-               return mlxsw_sp_flower_tmplt_create(mlxsw_sp, flow_block, f);
-       case FLOW_CLS_TMPLT_DESTROY:
-               mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, flow_block, f);
-               return 0;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int mlxsw_sp_setup_tc_block_cb(enum tc_setup_type type,
-                                     void *type_data, void *cb_priv)
-{
-       struct mlxsw_sp_flow_block *flow_block = cb_priv;
-
-       if (mlxsw_sp_flow_block_disabled(flow_block))
-               return -EOPNOTSUPP;
-
-       switch (type) {
-       case TC_SETUP_CLSMATCHALL:
-               return mlxsw_sp_setup_tc_cls_matchall(flow_block, type_data);
-       case TC_SETUP_CLSFLOWER:
-               return mlxsw_sp_setup_tc_cls_flower(flow_block, type_data);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void mlxsw_sp_tc_block_release(void *cb_priv)
-{
-       struct mlxsw_sp_flow_block *flow_block = cb_priv;
-
-       mlxsw_sp_flow_block_destroy(flow_block);
-}
-
-static LIST_HEAD(mlxsw_sp_block_cb_list);
-
-static int mlxsw_sp_setup_tc_block_bind(struct mlxsw_sp_port *mlxsw_sp_port,
-                                       struct flow_block_offload *f,
-                                       bool ingress)
-{
-       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-       struct mlxsw_sp_flow_block *flow_block;
-       struct flow_block_cb *block_cb;
-       bool register_block = false;
-       int err;
-
-       block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_setup_tc_block_cb,
-                                       mlxsw_sp);
-       if (!block_cb) {
-               flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, f->net);
-               if (!flow_block)
-                       return -ENOMEM;
-               block_cb = flow_block_cb_alloc(mlxsw_sp_setup_tc_block_cb,
-                                              mlxsw_sp, flow_block,
-                                              mlxsw_sp_tc_block_release);
-               if (IS_ERR(block_cb)) {
-                       mlxsw_sp_flow_block_destroy(flow_block);
-                       err = PTR_ERR(block_cb);
-                       goto err_cb_register;
-               }
-               register_block = true;
-       } else {
-               flow_block = flow_block_cb_priv(block_cb);
-       }
-       flow_block_cb_incref(block_cb);
-       err = mlxsw_sp_flow_block_bind(mlxsw_sp, flow_block,
-                                      mlxsw_sp_port, ingress, f->extack);
-       if (err)
-               goto err_block_bind;
-
-       if (ingress)
-               mlxsw_sp_port->ing_flow_block = flow_block;
-       else
-               mlxsw_sp_port->eg_flow_block = flow_block;
-
-       if (register_block) {
-               flow_block_cb_add(block_cb, f);
-               list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);
-       }
-
-       return 0;
-
-err_block_bind:
-       if (!flow_block_cb_decref(block_cb))
-               flow_block_cb_free(block_cb);
-err_cb_register:
-       return err;
-}
-
-static void mlxsw_sp_setup_tc_block_unbind(struct mlxsw_sp_port *mlxsw_sp_port,
-                                          struct flow_block_offload *f,
-                                          bool ingress)
-{
-       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-       struct mlxsw_sp_flow_block *flow_block;
-       struct flow_block_cb *block_cb;
-       int err;
-
-       block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_setup_tc_block_cb,
-                                       mlxsw_sp);
-       if (!block_cb)
-               return;
-
-       if (ingress)
-               mlxsw_sp_port->ing_flow_block = NULL;
-       else
-               mlxsw_sp_port->eg_flow_block = NULL;
-
-       flow_block = flow_block_cb_priv(block_cb);
-       err = mlxsw_sp_flow_block_unbind(mlxsw_sp, flow_block,
-                                        mlxsw_sp_port, ingress);
-       if (!err && !flow_block_cb_decref(block_cb)) {
-               flow_block_cb_remove(block_cb, f);
-               list_del(&block_cb->driver_list);
-       }
-}
-
-static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
-                                  struct flow_block_offload *f)
-{
-       bool ingress;
-
-       if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
-               ingress = true;
-       else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
-               ingress = false;
-       else
-               return -EOPNOTSUPP;
-
-       f->driver_block_list = &mlxsw_sp_block_cb_list;
-
-       switch (f->command) {
-       case FLOW_BLOCK_BIND:
-               return mlxsw_sp_setup_tc_block_bind(mlxsw_sp_port, f, ingress);
-       case FLOW_BLOCK_UNBIND:
-               mlxsw_sp_setup_tc_block_unbind(mlxsw_sp_port, f, ingress);
-               return 0;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
 static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,
                             void *type_data)
 {
@@ -1545,7 +1373,6 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,
        }
 }
 
-
 static int mlxsw_sp_feature_hw_tc(struct net_device *dev, bool enable)
 {
        struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 57d320728914d9e97c53e744ad63f1e820334836..a12ca673c224a1d7145bac77e306ca04fc5c6d45 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -708,15 +708,8 @@ mlxsw_sp_flow_block_is_mixed_bound(const struct mlxsw_sp_flow_block *block)
 struct mlxsw_sp_flow_block *mlxsw_sp_flow_block_create(struct mlxsw_sp *mlxsw_sp,
                                                       struct net *net);
 void mlxsw_sp_flow_block_destroy(struct mlxsw_sp_flow_block *block);
-int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,
-                            struct mlxsw_sp_flow_block *block,
-                            struct mlxsw_sp_port *mlxsw_sp_port,
-                            bool ingress,
-                            struct netlink_ext_ack *extack);
-int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,
-                              struct mlxsw_sp_flow_block *block,
-                              struct mlxsw_sp_port *mlxsw_sp_port,
-                              bool ingress);
+int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
+                           struct flow_block_offload *f);
 
 /* spectrum_acl.c */
 struct mlxsw_sp_acl_ruleset;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
index 51de6aca193041f0e4bcaca6b20dad4518795a31..ecab581ff956b3d54a29a30900ffbf1aa949729a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
@@ -49,11 +49,11 @@ mlxsw_sp_flow_block_ruleset_bound(const struct mlxsw_sp_flow_block *block)
        return block->ruleset_zero;
 }
 
-int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,
-                            struct mlxsw_sp_flow_block *block,
-                            struct mlxsw_sp_port *mlxsw_sp_port,
-                            bool ingress,
-                            struct netlink_ext_ack *extack)
+static int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,
+                                   struct mlxsw_sp_flow_block *block,
+                                   struct mlxsw_sp_port *mlxsw_sp_port,
+                                   bool ingress,
+                                   struct netlink_ext_ack *extack)
 {
        struct mlxsw_sp_flow_block_binding *binding;
        int err;
@@ -104,10 +104,10 @@ err_binding_alloc:
        return err;
 }
 
-int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,
-                              struct mlxsw_sp_flow_block *block,
-                              struct mlxsw_sp_port *mlxsw_sp_port,
-                              bool ingress)
+static int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,
+                                     struct mlxsw_sp_flow_block *block,
+                                     struct mlxsw_sp_port *mlxsw_sp_port,
+                                     bool ingress)
 {
        struct mlxsw_sp_flow_block_binding *binding;
 
@@ -131,3 +131,173 @@ int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,
 
        return 0;
 }
+
+static int mlxsw_sp_flow_block_mall_cb(struct mlxsw_sp_flow_block *flow_block,
+                                      struct tc_cls_matchall_offload *f)
+{
+       switch (f->command) {
+       case TC_CLSMATCHALL_REPLACE:
+               return mlxsw_sp_mall_replace(flow_block, f);
+       case TC_CLSMATCHALL_DESTROY:
+               mlxsw_sp_mall_destroy(flow_block, f);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int mlxsw_sp_flow_block_flower_cb(struct mlxsw_sp_flow_block *flow_block,
+                                        struct flow_cls_offload *f)
+{
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_flow_block_mlxsw_sp(flow_block);
+
+       switch (f->command) {
+       case FLOW_CLS_REPLACE:
+               return mlxsw_sp_flower_replace(mlxsw_sp, flow_block, f);
+       case FLOW_CLS_DESTROY:
+               mlxsw_sp_flower_destroy(mlxsw_sp, flow_block, f);
+               return 0;
+       case FLOW_CLS_STATS:
+               return mlxsw_sp_flower_stats(mlxsw_sp, flow_block, f);
+       case FLOW_CLS_TMPLT_CREATE:
+               return mlxsw_sp_flower_tmplt_create(mlxsw_sp, flow_block, f);
+       case FLOW_CLS_TMPLT_DESTROY:
+               mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, flow_block, f);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int mlxsw_sp_flow_block_cb(enum tc_setup_type type,
+                                 void *type_data, void *cb_priv)
+{
+       struct mlxsw_sp_flow_block *flow_block = cb_priv;
+
+       if (mlxsw_sp_flow_block_disabled(flow_block))
+               return -EOPNOTSUPP;
+
+       switch (type) {
+       case TC_SETUP_CLSMATCHALL:
+               return mlxsw_sp_flow_block_mall_cb(flow_block, type_data);
+       case TC_SETUP_CLSFLOWER:
+               return mlxsw_sp_flow_block_flower_cb(flow_block, type_data);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void mlxsw_sp_tc_block_release(void *cb_priv)
+{
+       struct mlxsw_sp_flow_block *flow_block = cb_priv;
+
+       mlxsw_sp_flow_block_destroy(flow_block);
+}
+
+static LIST_HEAD(mlxsw_sp_block_cb_list);
+
+static int mlxsw_sp_setup_tc_block_bind(struct mlxsw_sp_port *mlxsw_sp_port,
+                                       struct flow_block_offload *f,
+                                       bool ingress)
+{
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+       struct mlxsw_sp_flow_block *flow_block;
+       struct flow_block_cb *block_cb;
+       bool register_block = false;
+       int err;
+
+       block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_flow_block_cb,
+                                       mlxsw_sp);
+       if (!block_cb) {
+               flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, f->net);
+               if (!flow_block)
+                       return -ENOMEM;
+               block_cb = flow_block_cb_alloc(mlxsw_sp_flow_block_cb,
+                                              mlxsw_sp, flow_block,
+                                              mlxsw_sp_tc_block_release);
+               if (IS_ERR(block_cb)) {
+                       mlxsw_sp_flow_block_destroy(flow_block);
+                       err = PTR_ERR(block_cb);
+                       goto err_cb_register;
+               }
+               register_block = true;
+       } else {
+               flow_block = flow_block_cb_priv(block_cb);
+       }
+       flow_block_cb_incref(block_cb);
+       err = mlxsw_sp_flow_block_bind(mlxsw_sp, flow_block,
+                                      mlxsw_sp_port, ingress, f->extack);
+       if (err)
+               goto err_block_bind;
+
+       if (ingress)
+               mlxsw_sp_port->ing_flow_block = flow_block;
+       else
+               mlxsw_sp_port->eg_flow_block = flow_block;
+
+       if (register_block) {
+               flow_block_cb_add(block_cb, f);
+               list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);
+       }
+
+       return 0;
+
+err_block_bind:
+       if (!flow_block_cb_decref(block_cb))
+               flow_block_cb_free(block_cb);
+err_cb_register:
+       return err;
+}
+
+static void mlxsw_sp_setup_tc_block_unbind(struct mlxsw_sp_port *mlxsw_sp_port,
+                                          struct flow_block_offload *f,
+                                          bool ingress)
+{
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+       struct mlxsw_sp_flow_block *flow_block;
+       struct flow_block_cb *block_cb;
+       int err;
+
+       block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_flow_block_cb,
+                                       mlxsw_sp);
+       if (!block_cb)
+               return;
+
+       if (ingress)
+               mlxsw_sp_port->ing_flow_block = NULL;
+       else
+               mlxsw_sp_port->eg_flow_block = NULL;
+
+       flow_block = flow_block_cb_priv(block_cb);
+       err = mlxsw_sp_flow_block_unbind(mlxsw_sp, flow_block,
+                                        mlxsw_sp_port, ingress);
+       if (!err && !flow_block_cb_decref(block_cb)) {
+               flow_block_cb_remove(block_cb, f);
+               list_del(&block_cb->driver_list);
+       }
+}
+
+int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
+                           struct flow_block_offload *f)
+{
+       bool ingress;
+
+       if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
+               ingress = true;
+       else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
+               ingress = false;
+       else
+               return -EOPNOTSUPP;
+
+       f->driver_block_list = &mlxsw_sp_block_cb_list;
+
+       switch (f->command) {
+       case FLOW_BLOCK_BIND:
+               return mlxsw_sp_setup_tc_block_bind(mlxsw_sp_port, f, ingress);
+       case FLOW_BLOCK_UNBIND:
+               mlxsw_sp_setup_tc_block_unbind(mlxsw_sp_port, f, ingress);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}