net/sched: use tc_cls_stats_dump() in filter

use tc_cls_stats_dump() in filter.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Tested-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 8158fc9..d9fbaa0 100644 (file)
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -251,15 +251,8 @@ static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg,
        struct basic_filter *f;
 
        list_for_each_entry(f, &head->flist, link) {
-               if (arg->count < arg->skip)
-                       goto skip;
-
-               if (arg->fn(tp, f, arg) < 0) {
-                       arg->stop = 1;
+               if (!tc_cls_stats_dump(tp, arg, f))
                        break;
-               }
-skip:
-               arg->count++;
        }
 }
 

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index c85b85a..938be14 100644 (file)
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -650,14 +650,8 @@ static void cls_bpf_walk(struct tcf_proto *tp, struct tcf_walker *arg,
        struct cls_bpf_prog *prog;
 
        list_for_each_entry(prog, &head->plist, link) {
-               if (arg->count < arg->skip)
-                       goto skip;
-               if (arg->fn(tp, prog, arg) < 0) {
-                       arg->stop = 1;
+               if (!tc_cls_stats_dump(tp, arg, prog))
                        break;
-               }
-skip:
-               arg->count++;
        }
 }
 

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 972303a..014cd3d 100644 (file)
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -683,14 +683,8 @@ static void flow_walk(struct tcf_proto *tp, struct tcf_walker *arg,
        struct flow_filter *f;
 
        list_for_each_entry(f, &head->filters, list) {
-               if (arg->count < arg->skip)
-                       goto skip;
-               if (arg->fn(tp, f, arg) < 0) {
-                       arg->stop = 1;
+               if (!tc_cls_stats_dump(tp, arg, f))
                        break;
-               }
-skip:
-               arg->count++;
        }
 }
 

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 8654b0c..fa66191 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -358,15 +358,8 @@ static void fw_walk(struct tcf_proto *tp, struct tcf_walker *arg,
 
                for (f = rtnl_dereference(head->ht[h]); f;
                     f = rtnl_dereference(f->next)) {
-                       if (arg->count < arg->skip) {
-                               arg->count++;
-                               continue;
-                       }
-                       if (arg->fn(tp, f, arg) < 0) {
-                               arg->stop = 1;
+                       if (!tc_cls_stats_dump(tp, arg, f))
                                return;
-                       }
-                       arg->count++;
                }
        }
 }

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 29adac7..17bb04a 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -587,15 +587,8 @@ static void route4_walk(struct tcf_proto *tp, struct tcf_walker *arg,
                                for (f = rtnl_dereference(b->ht[h1]);
                                     f;
                                     f = rtnl_dereference(f->next)) {
-                                       if (arg->count < arg->skip) {
-                                               arg->count++;
-                                               continue;
-                                       }
-                                       if (arg->fn(tp, f, arg) < 0) {
-                                               arg->stop = 1;
+                                       if (!tc_cls_stats_dump(tp, arg, f))
                                                return;
-                                       }
-                                       arg->count++;
                                }
                        }
                }

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 5cd9d6b..fb60f2c 100644 (file)
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -671,15 +671,8 @@ static void rsvp_walk(struct tcf_proto *tp, struct tcf_walker *arg,
 
                                for (f = rtnl_dereference(s->ht[h1]); f;
                                     f = rtnl_dereference(f->next)) {
-                                       if (arg->count < arg->skip) {
-                                               arg->count++;
-                                               continue;
-                                       }
-                                       if (arg->fn(tp, f, arg) < 0) {
-                                               arg->stop = 1;
+                                       if (!tc_cls_stats_dump(tp, arg, f))
                                                return;
-                                       }
-                                       arg->count++;
                                }
                        }
                }

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 742c7d4..a330760 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -566,13 +566,8 @@ static void tcindex_walk(struct tcf_proto *tp, struct tcf_walker *walker,
                for (i = 0; i < p->hash; i++) {
                        if (!p->perfect[i].res.class)
                                continue;
-                       if (walker->count >= walker->skip) {
-                               if (walker->fn(tp, p->perfect + i, walker) < 0) {
-                                       walker->stop = 1;
-                                       return;
-                               }
-                       }
-                       walker->count++;
+                       if (!tc_cls_stats_dump(tp, walker, p->perfect + i))
+                               return;
                }
        }
        if (!p->h)
@@ -580,13 +575,8 @@ static void tcindex_walk(struct tcf_proto *tp, struct tcf_walker *walker,
        for (i = 0; i < p->hash; i++) {
                for (f = rtnl_dereference(p->h[i]); f; f = next) {
                        next = rtnl_dereference(f->next);
-                       if (walker->count >= walker->skip) {
-                               if (walker->fn(tp, &f->result, walker) < 0) {
-                                       walker->stop = 1;
-                                       return;
-                               }
-                       }
-                       walker->count++;
+                       if (!tc_cls_stats_dump(tp, walker, &f->result))
+                               return;
                }
        }
 }

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 4d27300..58c7680 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -1125,26 +1125,16 @@ static void u32_walk(struct tcf_proto *tp, struct tcf_walker *arg,
             ht = rtnl_dereference(ht->next)) {
                if (ht->prio != tp->prio)
                        continue;
-               if (arg->count >= arg->skip) {
-                       if (arg->fn(tp, ht, arg) < 0) {
-                               arg->stop = 1;
-                               return;
-                       }
-               }
-               arg->count++;
+
+               if (!tc_cls_stats_dump(tp, arg, ht))
+                       return;
+
                for (h = 0; h <= ht->divisor; h++) {
                        for (n = rtnl_dereference(ht->ht[h]);
                             n;
                             n = rtnl_dereference(n->next)) {
-                               if (arg->count < arg->skip) {
-                                       arg->count++;
-                                       continue;
-                               }
-                               if (arg->fn(tp, n, arg) < 0) {
-                                       arg->stop = 1;
+                               if (!tc_cls_stats_dump(tp, arg, n))
                                        return;
-                               }
-                               arg->count++;
                        }
                }
        }