Commit f6052cf2 authored by Davide Caratti's avatar Davide Caratti Committed by David S. Miller

net/sched: act_csum: use per-core statistics

use per-CPU counters, like other TC actions do, instead of maintaining one
set of stats across all cores. This allows updating act_csum stats without
the need of protecting them using spin_{,un}lock_bh() invocations.
Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b76f4189
...@@ -67,7 +67,7 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla, ...@@ -67,7 +67,7 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
if (!tcf_idr_check(tn, parm->index, a, bind)) { if (!tcf_idr_check(tn, parm->index, a, bind)) {
ret = tcf_idr_create(tn, parm->index, est, a, ret = tcf_idr_create(tn, parm->index, est, a,
&act_csum_ops, bind, false); &act_csum_ops, bind, true);
if (ret) if (ret)
return ret; return ret;
ret = ACT_P_CREATED; ret = ACT_P_CREATED;
...@@ -542,9 +542,9 @@ static int tcf_csum(struct sk_buff *skb, const struct tc_action *a, ...@@ -542,9 +542,9 @@ static int tcf_csum(struct sk_buff *skb, const struct tc_action *a,
int action; int action;
u32 update_flags; u32 update_flags;
spin_lock(&p->tcf_lock);
tcf_lastuse_update(&p->tcf_tm); tcf_lastuse_update(&p->tcf_tm);
bstats_update(&p->tcf_bstats, skb); bstats_cpu_update(this_cpu_ptr(p->common.cpu_bstats), skb);
spin_lock(&p->tcf_lock);
action = p->tcf_action; action = p->tcf_action;
update_flags = p->update_flags; update_flags = p->update_flags;
spin_unlock(&p->tcf_lock); spin_unlock(&p->tcf_lock);
...@@ -566,9 +566,7 @@ static int tcf_csum(struct sk_buff *skb, const struct tc_action *a, ...@@ -566,9 +566,7 @@ static int tcf_csum(struct sk_buff *skb, const struct tc_action *a,
return action; return action;
drop: drop:
spin_lock(&p->tcf_lock); qstats_drop_inc(this_cpu_ptr(p->common.cpu_qstats));
p->tcf_qstats.drops++;
spin_unlock(&p->tcf_lock);
return TC_ACT_SHOT; return TC_ACT_SHOT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment