Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f2ae965 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc6510a9

net/sched/act_gact.c

+7 −7
Original line number Diff line number Diff line
@@ -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++;