net: sched: Pass ingress block to tcf_classify_ingress

On ingress and cls_act qdiscs init, save the block on ingress
mini_Qdisc and and pass it on to ingress classification, so it
can be used for the looking up a specified chain index.

Co-developed-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 109cbe3a0d51591ed3c5c6daa72d2a26dc8bee09..75be5c065dba71bca48ffe42726c0d22fc22b406 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -72,8 +72,10 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
 
 int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
                 struct tcf_result *res, bool compat_mode);
-int tcf_classify_ingress(struct sk_buff *skb, const struct tcf_proto *tp,
-                        struct tcf_result *res, bool compat_mode);
+int tcf_classify_ingress(struct sk_buff *skb,
+                        const struct tcf_block *ingress_block,
+                        const struct tcf_proto *tp, struct tcf_result *res,
+                        bool compat_mode);
 
 #else
 static inline bool tcf_block_shared(struct tcf_block *block)
@@ -137,6 +139,7 @@ static inline int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 }
 
 static inline int tcf_classify_ingress(struct sk_buff *skb,
+                                      const struct tcf_block *ingress_block,
                                       const struct tcf_proto *tp,
                                       struct tcf_result *res, bool compat_mode)
 {

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 151208704ed2e6d71c6a06afcd1473e68428c88b..bcdf98d21094843804d7d8f9f86834e6f46ef77f 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -1269,6 +1269,7 @@ static inline void psched_ratecfg_getrate(struct tc_ratespec *res,
  */
 struct mini_Qdisc {
        struct tcf_proto *filter_list;
+       struct tcf_block *block;
        struct gnet_stats_basic_cpu __percpu *cpu_bstats;
        struct gnet_stats_queue __percpu *cpu_qstats;
        struct rcu_head rcu;
@@ -1295,6 +1296,8 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
                          struct tcf_proto *tp_head);
 void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,
                          struct mini_Qdisc __rcu **p_miniq);
+void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,
+                               struct tcf_block *block);
 
 static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)
 {

diff --git a/net/core/dev.c b/net/core/dev.c
index 107af00e49328f5c12695b9ccfeb4cf6083a34d0..4866e6198a29dfc81c9071eb7a43a85365fa0e19 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4860,8 +4860,8 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,
        skb->tc_at_ingress = 1;
        mini_qdisc_bstats_cpu_update(miniq, skb);
 
-       switch (tcf_classify_ingress(skb, miniq->filter_list, &cl_res,
-                                    false)) {
+       switch (tcf_classify_ingress(skb, miniq->block, miniq->filter_list,
+                                    &cl_res, false)) {
        case TC_ACT_OK:
        case TC_ACT_RECLASSIFY:
                skb->tc_index = TC_H_MIN(cl_res.classid);

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index d52b43c56d5d08da907d47401a6bc7d091ba69b4..bbd8b5e7b74be74a45b71b467ebde0dc144b3436 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1623,7 +1623,9 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 }
 EXPORT_SYMBOL(tcf_classify);
 
-int tcf_classify_ingress(struct sk_buff *skb, const struct tcf_proto *tp,
+int tcf_classify_ingress(struct sk_buff *skb,
+                        const struct tcf_block *ingress_block,
+                        const struct tcf_proto *tp,
                         struct tcf_result *res, bool compat_mode)
 {
 #if !IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 6c9595f1048aa116575f9582b0d8ab04abc04104..2efd5b61acef1edc10351f552f8e9e61fbfa9877 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1391,6 +1391,14 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
 }
 EXPORT_SYMBOL(mini_qdisc_pair_swap);
 
+void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,
+                               struct tcf_block *block)
+{
+       miniqp->miniq1.block = block;
+       miniqp->miniq2.block = block;
+}
+EXPORT_SYMBOL(mini_qdisc_pair_block_init);
+
 void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,
                          struct mini_Qdisc __rcu **p_miniq)
 {

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index bf56aa519797404b7d1cf24213fdb922b412beb4..84838128b9c5b53db597c3923ca98ea5326081d7 100644 (file)
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -78,6 +78,7 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
 {
        struct ingress_sched_data *q = qdisc_priv(sch);
        struct net_device *dev = qdisc_dev(sch);
+       int err;
 
        net_inc_ingress_queue();
 
@@ -87,7 +88,13 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
        q->block_info.chain_head_change = clsact_chain_head_change;
        q->block_info.chain_head_change_priv = &q->miniqp;
 
-       return tcf_block_get_ext(&q->block, sch, &q->block_info, extack);
+       err = tcf_block_get_ext(&q->block, sch, &q->block_info, extack);
+       if (err)
+               return err;
+
+       mini_qdisc_pair_block_init(&q->miniqp, q->block);
+
+       return 0;
 }
 
 static void ingress_destroy(struct Qdisc *sch)
@@ -226,6 +233,8 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
        if (err)
                return err;
 
+       mini_qdisc_pair_block_init(&q->miniqp_ingress, q->ingress_block);
+
        mini_qdisc_pair_init(&q->miniqp_egress, sch, &dev->miniq_egress);
 
        q->egress_block_info.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS;