net/sched: Change cls_flower to use IDR

Currently, all filters with the same priority are linked in a doubly
linked list. Every filter should have a unique handle. To make the
handle unique, we need to iterate the list every time to see if the
handle exists or not when inserting a new filter. It is time-consuming.
For example, it takes about 5m3.169s to insert 64K rules.

This patch changes cls_flower to use IDR. With this patch, it
takes about 0m1.127s to insert 64K rules. The improvement is huge.

But please note that in this testing, all filters share the same action.
If every filter has a unique action, that is another bottleneck.
Follow-up patch in this patchset addresses that.

Signed-off-by: Chris Mi <chrism@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index bd9dab4..3d041d2 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -68,7 +68,6 @@ struct cls_fl_head {
        struct rhashtable ht;
        struct fl_flow_mask mask;
        struct flow_dissector dissector;
-       u32 hgen;
        bool mask_assigned;
        struct list_head filters;
        struct rhashtable_params ht_params;
@@ -76,6 +75,7 @@ struct cls_fl_head {
                struct work_struct work;
                struct rcu_head rcu;
        };
+       struct idr handle_idr;
 };
 
 struct cls_fl_filter {
@@ -210,6 +210,7 @@ static int fl_init(struct tcf_proto *tp)
 
        INIT_LIST_HEAD_RCU(&head->filters);
        rcu_assign_pointer(tp->root, head);
+       idr_init(&head->handle_idr);
 
        return 0;
 }
@@ -295,6 +296,9 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
 
 static void __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f)
 {
+       struct cls_fl_head *head = rtnl_dereference(tp->root);
+
+       idr_remove_ext(&head->handle_idr, f->handle);
        list_del_rcu(&f->list);
        if (!tc_skip_hw(f->flags))
                fl_hw_destroy_filter(tp, f);
@@ -327,6 +331,7 @@ static void fl_destroy(struct tcf_proto *tp)
 
        list_for_each_entry_safe(f, next, &head->filters, list)
                __fl_delete(tp, f);
+       idr_destroy(&head->handle_idr);
 
        __module_get(THIS_MODULE);
        call_rcu(&head->rcu, fl_destroy_rcu);
@@ -335,12 +340,8 @@ static void fl_destroy(struct tcf_proto *tp)
 static void *fl_get(struct tcf_proto *tp, u32 handle)
 {
        struct cls_fl_head *head = rtnl_dereference(tp->root);
-       struct cls_fl_filter *f;
 
-       list_for_each_entry(f, &head->filters, list)
-               if (f->handle == handle)
-                       return f;
-       return NULL;
+       return idr_find_ext(&head->handle_idr, handle);
 }
 
 static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {
@@ -859,27 +860,6 @@ static int fl_set_parms(struct net *net, struct tcf_proto *tp,
        return 0;
 }
 
-static u32 fl_grab_new_handle(struct tcf_proto *tp,
-                             struct cls_fl_head *head)
-{
-       unsigned int i = 0x80000000;
-       u32 handle;
-
-       do {
-               if (++head->hgen == 0x7FFFFFFF)
-                       head->hgen = 1;
-       } while (--i > 0 && fl_get(tp, head->hgen));
-
-       if (unlikely(i == 0)) {
-               pr_err("Insufficient number of handles\n");
-               handle = 0;
-       } else {
-               handle = head->hgen;
-       }
-
-       return handle;
-}
-
 static int fl_change(struct net *net, struct sk_buff *in_skb,
                     struct tcf_proto *tp, unsigned long base,
                     u32 handle, struct nlattr **tca,
@@ -890,6 +870,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
        struct cls_fl_filter *fnew;
        struct nlattr **tb;
        struct fl_flow_mask mask = {};
+       unsigned long idr_index;
        int err;
 
        if (!tca[TCA_OPTIONS])
@@ -920,13 +901,21 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
                goto errout;
 
        if (!handle) {
-               handle = fl_grab_new_handle(tp, head);
-               if (!handle) {
-                       err = -EINVAL;
+               err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
+                                   1, 0x80000000, GFP_KERNEL);
+               if (err)
                        goto errout;
-               }
+               fnew->handle = idr_index;
+       }
+
+       /* user specifies a handle and it doesn't exist */
+       if (handle && !fold) {
+               err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
+                                   handle, handle + 1, GFP_KERNEL);
+               if (err)
+                       goto errout;
+               fnew->handle = idr_index;
        }
-       fnew->handle = handle;
 
        if (tb[TCA_FLOWER_FLAGS]) {
                fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]);
@@ -980,6 +969,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
        *arg = fnew;
 
        if (fold) {
+               fnew->handle = handle;
+               idr_replace_ext(&head->handle_idr, fnew, fnew->handle);
                list_replace_rcu(&fold->list, &fnew->list);
                tcf_unbind_filter(tp, &fold->res);
                call_rcu(&fold->rcu, fl_destroy_filter);