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

net/sched: skbedit: use per-cpu counters

use per-CPU counters, instead of sharing a single set of stats with all
cores: this removes the need of spinlocks when stats are read/updated.
Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cca9bab1
...@@ -38,10 +38,10 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, ...@@ -38,10 +38,10 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
{ {
struct tcf_skbedit *d = to_skbedit(a); struct tcf_skbedit *d = to_skbedit(a);
spin_lock(&d->tcf_lock);
tcf_lastuse_update(&d->tcf_tm); tcf_lastuse_update(&d->tcf_tm);
bstats_update(&d->tcf_bstats, skb); bstats_cpu_update(this_cpu_ptr(d->common.cpu_bstats), skb);
spin_lock(&d->tcf_lock);
if (d->flags & SKBEDIT_F_PRIORITY) if (d->flags & SKBEDIT_F_PRIORITY)
skb->priority = d->priority; skb->priority = d->priority;
if (d->flags & SKBEDIT_F_INHERITDSFIELD) { if (d->flags & SKBEDIT_F_INHERITDSFIELD) {
...@@ -77,8 +77,8 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, ...@@ -77,8 +77,8 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
return d->tcf_action; return d->tcf_action;
err: err:
d->tcf_qstats.drops++;
spin_unlock(&d->tcf_lock); spin_unlock(&d->tcf_lock);
qstats_drop_inc(this_cpu_ptr(d->common.cpu_qstats));
return TC_ACT_SHOT; return TC_ACT_SHOT;
} }
...@@ -169,7 +169,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, ...@@ -169,7 +169,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
if (!exists) { if (!exists) {
ret = tcf_idr_create(tn, parm->index, est, a, ret = tcf_idr_create(tn, parm->index, est, a,
&act_skbedit_ops, bind, false); &act_skbedit_ops, bind, true);
if (ret) { if (ret) {
tcf_idr_cleanup(tn, parm->index); tcf_idr_cleanup(tn, parm->index);
return ret; return ret;
......
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