dsa: Convert ndo_setup_tc offloads to block callbacks

Benefit from the newly introduced block callback infrastructure and
convert ndo_setup_tc calls for matchall offloads to block callbacks.

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

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 6906de0f0050d36d0856fc11f4f0e837ce758f6c..80142918d5d174575806d408d0763855687fdb20 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -777,17 +777,9 @@ static void dsa_slave_del_cls_matchall(struct net_device *dev,
 }
 
 static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,
-                                          struct tc_cls_matchall_offload *cls)
+                                          struct tc_cls_matchall_offload *cls,
+                                          bool ingress)
 {
-       bool ingress;
-
-       if (is_classid_clsact_ingress(cls->common.classid))
-               ingress = true;
-       else if (is_classid_clsact_egress(cls->common.classid))
-               ingress = false;
-       else
-               return -EOPNOTSUPP;
-
        if (cls->common.chain_index)
                return -EOPNOTSUPP;
 
@@ -802,12 +794,62 @@ static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,
        }
 }
 
+static int dsa_slave_setup_tc_block_cb(enum tc_setup_type type, void *type_data,
+                                      void *cb_priv, bool ingress)
+{
+       struct net_device *dev = cb_priv;
+
+       switch (type) {
+       case TC_SETUP_CLSMATCHALL:
+               return dsa_slave_setup_tc_cls_matchall(dev, type_data, ingress);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int dsa_slave_setup_tc_block_cb_ig(enum tc_setup_type type,
+                                         void *type_data, void *cb_priv)
+{
+       return dsa_slave_setup_tc_block_cb(type, type_data, cb_priv, true);
+}
+
+static int dsa_slave_setup_tc_block_cb_eg(enum tc_setup_type type,
+                                         void *type_data, void *cb_priv)
+{
+       return dsa_slave_setup_tc_block_cb(type, type_data, cb_priv, false);
+}
+
+static int dsa_slave_setup_tc_block(struct net_device *dev,
+                                   struct tc_block_offload *f)
+{
+       tc_setup_cb_t *cb;
+
+       if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
+               cb = dsa_slave_setup_tc_block_cb_ig;
+       else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
+               cb = dsa_slave_setup_tc_block_cb_eg;
+       else
+               return -EOPNOTSUPP;
+
+       switch (f->command) {
+       case TC_BLOCK_BIND:
+               return tcf_block_cb_register(f->block, cb, dev, dev);
+       case TC_BLOCK_UNBIND:
+               tcf_block_cb_unregister(f->block, cb, dev);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
 static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
                              void *type_data)
 {
        switch (type) {
        case TC_SETUP_CLSMATCHALL:
-               return dsa_slave_setup_tc_cls_matchall(dev, type_data);
+               return 0; /* will be removed after conversion from ndo */
+       case TC_SETUP_BLOCK:
+               return dsa_slave_setup_tc_block(dev, type_data);
        default:
                return -EOPNOTSUPP;
        }