Skip to content

Commit

Permalink
net_sched: act_gact: read tcfg_ptype once
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jul 8, 2015
1 parent cc6510a commit 8f2ae96
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/sched/act_gact.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down

0 comments on commit 8f2ae96

Please sign in to comment.