diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-07-06 15:18:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-08 23:50:42 +0300 |
| commit | 8f2ae965b7ef4f4ddab6110f06388e270723d694 (patch) | |
| tree | a9eab96bbfdf0be97e2d78a165edcdc769d5ca08 /net/sched/act_gact.c | |
| parent | cc6510a9504fd3c03d76bd68d99653148342eecc (diff) | |
| download | linux-8f2ae965b7ef4f4ddab6110f06388e270723d694.tar.xz | |
net_sched: act_gact: read tcfg_ptype once
Third step for gact RCU operation :
Following patch will get rid of spinlock protection,
so we need to read tcfg_ptype once.
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>
Diffstat (limited to 'net/sched/act_gact.c')
| -rw-r--r-- | net/sched/act_gact.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 2f9bec584b3f..e4eb88d3d8dc 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -127,16 +127,16 @@ static int tcf_gact(struct sk_buff *skb, const struct tc_action *a, struct tcf_result *res) { struct tcf_gact *gact = a->priv; - int action = TC_ACT_SHOT; + int action = gact->tcf_action; spin_lock(&gact->tcf_lock); #ifdef CONFIG_GACT_PROB - if (gact->tcfg_ptype) - action = gact_rand[gact->tcfg_ptype](gact); - else - action = gact->tcf_action; -#else - action = gact->tcf_action; + { + u32 ptype = READ_ONCE(gact->tcfg_ptype); + + if (ptype) + action = gact_rand[ptype](gact); + } #endif gact->tcf_bstats.bytes += qdisc_pkt_len(skb); gact->tcf_bstats.packets++; |