net: dsa: Add bypass operations for the flower classifier-action filter

Due to the immense variety of classification keys and actions available
for tc-flower, as well as due to potentially very different DSA switch
capabilities, it doesn't make a lot of sense for the DSA mid layer to
even attempt to interpret these. So just pass them on to the underlying
switch driver.

DSA implements just the standard boilerplate for binding and unbinding
flow blocks to ports, since nobody wants to deal with that.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 7d3d84f0ef42a6b365e9ecfea29bd0c4e4e9b1a1..beeb81a532e3361011e6c22ab25c05895c9d463b 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -540,6 +540,12 @@ struct dsa_switch_ops {
        /*
         * TC integration
         */
+       int     (*cls_flower_add)(struct dsa_switch *ds, int port,
+                                 struct flow_cls_offload *cls, bool ingress);
+       int     (*cls_flower_del)(struct dsa_switch *ds, int port,
+                                 struct flow_cls_offload *cls, bool ingress);
+       int     (*cls_flower_stats)(struct dsa_switch *ds, int port,
+                                   struct flow_cls_offload *cls, bool ingress);
        int     (*port_mirror_add)(struct dsa_switch *ds, int port,
                                   struct dsa_mall_mirror_tc_entry *mirror,
                                   bool ingress);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 088c886e609ee78d15aa139aad469471b833e057..79d9b4384d7b6bb192cd68fe398db057a14a2672 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -946,6 +946,64 @@ static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,
        }
 }
 
+static int dsa_slave_add_cls_flower(struct net_device *dev,
+                                   struct flow_cls_offload *cls,
+                                   bool ingress)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+
+       if (!ds->ops->cls_flower_add)
+               return -EOPNOTSUPP;
+
+       return ds->ops->cls_flower_add(ds, port, cls, ingress);
+}
+
+static int dsa_slave_del_cls_flower(struct net_device *dev,
+                                   struct flow_cls_offload *cls,
+                                   bool ingress)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+
+       if (!ds->ops->cls_flower_del)
+               return -EOPNOTSUPP;
+
+       return ds->ops->cls_flower_del(ds, port, cls, ingress);
+}
+
+static int dsa_slave_stats_cls_flower(struct net_device *dev,
+                                     struct flow_cls_offload *cls,
+                                     bool ingress)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
+
+       if (!ds->ops->cls_flower_stats)
+               return -EOPNOTSUPP;
+
+       return ds->ops->cls_flower_stats(ds, port, cls, ingress);
+}
+
+static int dsa_slave_setup_tc_cls_flower(struct net_device *dev,
+                                        struct flow_cls_offload *cls,
+                                        bool ingress)
+{
+       switch (cls->command) {
+       case FLOW_CLS_REPLACE:
+               return dsa_slave_add_cls_flower(dev, cls, ingress);
+       case FLOW_CLS_DESTROY:
+               return dsa_slave_del_cls_flower(dev, cls, ingress);
+       case FLOW_CLS_STATS:
+               return dsa_slave_stats_cls_flower(dev, cls, ingress);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
 static int dsa_slave_setup_tc_block_cb(enum tc_setup_type type, void *type_data,
                                       void *cb_priv, bool ingress)
 {
@@ -957,6 +1015,8 @@ static int dsa_slave_setup_tc_block_cb(enum tc_setup_type type, void *type_data,
        switch (type) {
        case TC_SETUP_CLSMATCHALL:
                return dsa_slave_setup_tc_cls_matchall(dev, type_data, ingress);
+       case TC_SETUP_CLSFLOWER:
+               return dsa_slave_setup_tc_cls_flower(dev, type_data, ingress);
        default:
                return -EOPNOTSUPP;
        }