Re: [PATCH net-next 3/6] net_sched: act: make tcfg_pval non zero

[John Fastabend <john.fastabend@gmail.com>]

On 15-07-02 06:07 AM, Eric Dumazet wrote:
> First step for gact RCU operation :
> 
> Instead of testing if tcfg_pval is zero or not, just make it 1.
> 
> No change in behavior, but slightly faster code.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Alexei Starovoitov <ast@plumgrid.com>
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: John Fastabend <john.fastabend@gmail.com>
> ---
>  net/sched/act_gact.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
> index a4f8af29ee30..42284aad77dd 100644
> --- a/net/sched/act_gact.c
> +++ b/net/sched/act_gact.c

Acked-by: John Fastabend <john.r.fastabend@intel.com>

> @@ -28,14 +28,14 @@
>  #ifdef CONFIG_GACT_PROB
>  static int gact_net_rand(struct tcf_gact *gact)
>  {
> -	if (!gact->tcfg_pval || prandom_u32() % gact->tcfg_pval)
> +	if (prandom_u32() % gact->tcfg_pval)
>  		return gact->tcf_action;
>  	return gact->tcfg_paction;
>  }
>  
>  static int gact_determ(struct tcf_gact *gact)
>  {
> -	if (!gact->tcfg_pval || gact->tcf_bstats.packets % gact->tcfg_pval)
> +	if (gact->tcf_bstats.packets % gact->tcfg_pval)
>  		return gact->tcf_action;
>  	return gact->tcfg_paction;
>  }
> @@ -105,7 +105,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
>  #ifdef CONFIG_GACT_PROB
>  	if (p_parm) {
>  		gact->tcfg_paction = p_parm->paction;
> -		gact->tcfg_pval    = p_parm->pval;
> +		gact->tcfg_pval    = max_t(u16, 1, p_parm->pval);
>  		gact->tcfg_ptype   = p_parm->ptype;
>  	}
>  #endif
>