net: sched: use tc_setup_cb_call to call per-block callbacks

Extend the tc_setup_cb_call entrypoint function originally used only for
action egress devices callbacks to call per-block callbacks as well.

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

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 4bc6b1c..fcca5a9 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -543,8 +543,8 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
 }
 #endif /* CONFIG_NET_CLS_IND */
 
-int tc_setup_cb_call(struct tcf_exts *exts, enum tc_setup_type type,
-                    void *type_data, bool err_stop);
+int tc_setup_cb_call(struct tcf_block *block, struct tcf_exts *exts,
+                    enum tc_setup_type type, void *type_data, bool err_stop);
 
 enum tc_block_command {
        TC_BLOCK_BIND,

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index b16c79c..cdfdc24 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1206,10 +1206,25 @@ static int tc_exts_setup_cb_egdev_call(struct tcf_exts *exts,
        return ok_count;
 }
 
-int tc_setup_cb_call(struct tcf_exts *exts, enum tc_setup_type type,
-                    void *type_data, bool err_stop)
+int tc_setup_cb_call(struct tcf_block *block, struct tcf_exts *exts,
+                    enum tc_setup_type type, void *type_data, bool err_stop)
 {
-       return tc_exts_setup_cb_egdev_call(exts, type, type_data, err_stop);
+       int ok_count;
+       int ret;
+
+       ret = tcf_block_cb_call(block, type, type_data, err_stop);
+       if (ret < 0)
+               return ret;
+       ok_count = ret;
+
+       if (!exts)
+               return ok_count;
+       ret = tc_exts_setup_cb_egdev_call(exts, type, type_data, err_stop);
+       if (ret < 0)
+               return ret;
+       ok_count += ret;
+
+       return ok_count;
 }
 EXPORT_SYMBOL(tc_setup_cb_call);
 

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 5b7bb96..76b4e0a 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -201,6 +201,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
 {
        struct tc_cls_flower_offload cls_flower = {};
        struct net_device *dev = tp->q->dev_queue->dev;
+       struct tcf_block *block = tp->chain->block;
 
        tc_cls_common_offload_init(&cls_flower.common, tp);
        cls_flower.command = TC_CLSFLOWER_DESTROY;
@@ -209,7 +210,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
        if (tc_can_offload(dev))
                dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,
                                              &cls_flower);
-       tc_setup_cb_call(&f->exts, TC_SETUP_CLSFLOWER,
+       tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER,
                         &cls_flower, false);
 }
 
@@ -220,6 +221,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
 {
        struct net_device *dev = tp->q->dev_queue->dev;
        struct tc_cls_flower_offload cls_flower = {};
+       struct tcf_block *block = tp->chain->block;
        bool skip_sw = tc_skip_sw(f->flags);
        int err;
 
@@ -242,7 +244,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
                }
        }
 
-       err = tc_setup_cb_call(&f->exts, TC_SETUP_CLSFLOWER,
+       err = tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER,
                               &cls_flower, skip_sw);
        if (err < 0) {
                fl_hw_destroy_filter(tp, f);
@@ -261,6 +263,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
 {
        struct tc_cls_flower_offload cls_flower = {};
        struct net_device *dev = tp->q->dev_queue->dev;
+       struct tcf_block *block = tp->chain->block;
 
        tc_cls_common_offload_init(&cls_flower.common, tp);
        cls_flower.command = TC_CLSFLOWER_STATS;
@@ -270,7 +273,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
        if (tc_can_offload(dev))
                dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,
                                              &cls_flower);
-       tc_setup_cb_call(&f->exts, TC_SETUP_CLSFLOWER,
+       tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER,
                         &cls_flower, false);
 }