net: sched: extract qstats update code into functions

Extract common code that increments cpu_qstats counters into standalone act
API functions. Change hardware offloaded actions that use percpu counter
allocation to use the new functions instead of accessing cpu_qstats
directly.

This commit doesn't change functionality.

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

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 9a32853..8d6861c 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -193,6 +193,22 @@ static inline void tcf_action_update_bstats(struct tc_action *a,
        bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), skb);
 }
 
+static inline struct gnet_stats_queue *
+tcf_action_get_qstats(struct tc_action *a)
+{
+       return this_cpu_ptr(a->cpu_qstats);
+}
+
+static inline void tcf_action_inc_drop_qstats(struct tc_action *a)
+{
+       qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));
+}
+
+static inline void tcf_action_inc_overlimit_qstats(struct tc_action *a)
+{
+       qstats_overlimit_inc(this_cpu_ptr(a->cpu_qstats));
+}
+
 void tcf_action_update_stats(struct tc_action *a, u64 bytes, u32 packets,
                             bool drop, bool hw);
 int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 69747b1..bc909cf 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -624,7 +624,7 @@ out:
        return action;
 
 drop:
-       qstats_drop_inc(this_cpu_ptr(p->common.cpu_qstats));
+       tcf_action_inc_drop_qstats(&p->common);
        action = TC_ACT_SHOT;
        goto out;
 }

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index f977990..eabae22 100644 (file)
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -469,7 +469,7 @@ out:
        return retval;
 
 drop:
-       qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));
+       tcf_action_inc_drop_qstats(&c->common);
        return TC_ACT_SHOT;
 }
 

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index a7e3d56..221f0c2 100644 (file)
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -163,7 +163,7 @@ static int tcf_gact_act(struct sk_buff *skb, const struct tc_action *a,
 #endif
        tcf_action_update_bstats(&gact->common, skb);
        if (action == TC_ACT_SHOT)
-               qstats_drop_inc(this_cpu_ptr(gact->common.cpu_qstats));
+               tcf_action_inc_drop_qstats(&gact->common);
 
        tcf_lastuse_update(&gact->tcf_tm);
 

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index e5216f8..49a378a 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -303,7 +303,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
 
        if (err) {
 out:
-               qstats_overlimit_inc(this_cpu_ptr(m->common.cpu_qstats));
+               tcf_action_inc_overlimit_qstats(&m->common);
                if (tcf_mirred_is_act_redirect(m_eaction))
                        retval = TC_ACT_SHOT;
        }

diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index f6dccaa..ffa0f43 100644 (file)
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -88,7 +88,7 @@ out:
        return action;
 
 drop:
-       qstats_drop_inc(this_cpu_ptr(v->common.cpu_qstats));
+       tcf_action_inc_drop_qstats(&v->common);
        return TC_ACT_SHOT;
 }