diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-07-06 05:18:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-08 13:50:42 -0700 |
| commit | cc6510a9504fd3c03d76bd68d99653148342eecc (patch) | |
| tree | 0faf9f73bdb9cdf72787bc138792135c017ffa37 | |
| parent | cef5ecf96b28dc91c4e9f398a336c578fb9e1a0c (diff) | |
| download | op-kernel-dev-cc6510a9504fd3c03d76bd68d99653148342eecc.zip op-kernel-dev-cc6510a9504fd3c03d76bd68d99653148342eecc.tar.gz | |
net_sched: act_gact: use a separate packet counters for gact_determ()
Second step for gact RCU operation :
We want to get rid of the spinlock protecting gact operations.
Stats (packets/bytes) will soon be per cpu.
gact_determ() would not work without a central packet counter,
so lets add it for this mode.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/tc_act/tc_gact.h | 7 | ||||
| -rw-r--r-- | net/sched/act_gact.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h index 9fc9b57..592a6bc 100644 --- a/include/net/tc_act/tc_gact.h +++ b/include/net/tc_act/tc_gact.h @@ -6,9 +6,10 @@ struct tcf_gact { struct tcf_common common; #ifdef CONFIG_GACT_PROB - u16 tcfg_ptype; - u16 tcfg_pval; - int tcfg_paction; + u16 tcfg_ptype; + u16 tcfg_pval; + int tcfg_paction; + atomic_t packets; #endif }; #define to_gact(a) \ diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 22a3a61..2f9bec5 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -36,8 +36,10 @@ static int gact_net_rand(struct tcf_gact *gact) static int gact_determ(struct tcf_gact *gact) { + u32 pack = atomic_inc_return(&gact->packets); + smp_rmb(); /* coupled with smp_wmb() in tcf_gact_init() */ - if (gact->tcf_bstats.packets % gact->tcfg_pval) + if (pack % gact->tcfg_pval) return gact->tcf_action; return gact->tcfg_paction; } |
