rcu: Call mod_timer() correctly in wake_nocb_leader_defer()

rcu: Call mod_timer() correctly in wake_nocb_leader_defer()

[Dan Carpenter]

Smatch complains that:

	kernel/rcu/tree_plugin.h:1838 wake_nocb_leader_defer()
	warn: mod_timer() takes an absolute time not an offset.

which is true.

Fixes: ebf7068a4396 ("rcu: Use timer as backstop for NOCB deferred wakeups")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 34dbd0aad732..74492f20c252 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -1835,7 +1835,7 @@ static void wake_nocb_leader_defer(struct rcu_data *rdp, int waketype,
 	trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, reason);
 	raw_spin_unlock_irqrestore(&rdp->nocb_lock, flags);
 	if (needtimer)
-		mod_timer(&rdp->nocb_timer, 1);
+		mod_timer(&rdp->nocb_timer, jiffies + 1);
 }
 
 /*

Re: rcu: Call mod_timer() correctly in wake_nocb_leader_defer()

[Paul E. McKenney]

On Wed, May 17, 2017 at 10:44:46PM +0300, Dan Carpenter wrote:
> Smatch complains that:
> 
> 	kernel/rcu/tree_plugin.h:1838 wake_nocb_leader_defer()
> 	warn: mod_timer() takes an absolute time not an offset.
> 
> which is true.
> 
> Fixes: ebf7068a4396 ("rcu: Use timer as backstop for NOCB deferred wakeups")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Good catch, and color me slow and stupid!!!

I will fold this into the original commit with the following attribution:

[ paulmck: Dan Williams fix for mod_timer() bug detected by smatch. ]

Does that work for you?

							Thanx, Paul

PS.  This likely fixes the bug that causes about one temporary
     grace-period stall every 20 hours of rcutorture testing on the
     TREE01 test scenario.  I finally bisected to it, but it would take
     me through the weekend to accumulate statistical confidence in
     my bisection.  So it will take me some time to establish
     statistcal confidence in this fix, but hey, a fix!!!  ;-)

     Thank you!!!

> diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
> index 34dbd0aad732..74492f20c252 100644
> --- a/kernel/rcu/tree_plugin.h
> +++ b/kernel/rcu/tree_plugin.h
> @@ -1835,7 +1835,7 @@ static void wake_nocb_leader_defer(struct rcu_data *rdp, int waketype,
>  	trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, reason);
>  	raw_spin_unlock_irqrestore(&rdp->nocb_lock, flags);
>  	if (needtimer)
> -		mod_timer(&rdp->nocb_timer, 1);
> +		mod_timer(&rdp->nocb_timer, jiffies + 1);
>  }
> 
>  /*
> 

Re: rcu: Call mod_timer() correctly in wake_nocb_leader_defer()

[Dan Carpenter]

On Wed, May 17, 2017 at 01:21:48PM -0700, Paul E. McKenney wrote:
> On Wed, May 17, 2017 at 10:44:46PM +0300, Dan Carpenter wrote:
> > Smatch complains that:
> > 
> > 	kernel/rcu/tree_plugin.h:1838 wake_nocb_leader_defer()
> > 	warn: mod_timer() takes an absolute time not an offset.
> > 
> > which is true.
> > 
> > Fixes: ebf7068a4396 ("rcu: Use timer as backstop for NOCB deferred wakeups")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Good catch, and color me slow and stupid!!!
> 
> I will fold this into the original commit with the following attribution:
> 
> [ paulmck: Dan Williams fix for mod_timer() bug detected by smatch. ]
> 
> Does that work for you?

Not really, no.  If you changed the Williams to Carpenter, then it's
fine, though.  ;)

regards,
dan carpenter

Re: rcu: Call mod_timer() correctly in wake_nocb_leader_defer()

[Paul E. McKenney]

On Wed, May 17, 2017 at 11:37:16PM +0300, Dan Carpenter wrote:
> On Wed, May 17, 2017 at 01:21:48PM -0700, Paul E. McKenney wrote:
> > On Wed, May 17, 2017 at 10:44:46PM +0300, Dan Carpenter wrote:
> > > Smatch complains that:
> > > 
> > > 	kernel/rcu/tree_plugin.h:1838 wake_nocb_leader_defer()
> > > 	warn: mod_timer() takes an absolute time not an offset.
> > > 
> > > which is true.
> > > 
> > > Fixes: ebf7068a4396 ("rcu: Use timer as backstop for NOCB deferred wakeups")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > Good catch, and color me slow and stupid!!!
> > 
> > I will fold this into the original commit with the following attribution:
> > 
> > [ paulmck: Dan Williams fix for mod_timer() bug detected by smatch. ]
> > 
> > Does that work for you?
> 
> Not really, no.  If you changed the Williams to Carpenter, then it's
> fine, though.  ;)

Gah!!!  I been Danned!!!  ;-)

Please accept my apologies, is the following better?

							Thanx, Paul

[ paulmck: Dan Carpenter fix for mod_timer() usage bug found by smatch. ]