* [NET]: Fix gen_estimator timer removal race
@ 2007-07-04 15:47 Patrick McHardy
2007-07-05 5:48 ` Jarek Poplawski
0 siblings, 1 reply; 3+ messages in thread
From: Patrick McHardy @ 2007-07-04 15:47 UTC (permalink / raw)
To: David Miller; +Cc: Jarek Poplawski, Linux Netdev List
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
This is an updated version of the gen_estimator fix
that relies on all changes happening under the rtnl
and just fixes the race between timer rearming and
timer removal.
[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1149 bytes --]
[NET]: Fix gen_estimator timer removal race
As noticed by Jarek Poplawski <jarkao2@o2.pl>, the timer removal in
gen_kill_estimator races with the timer function rearming the timer.
Check whether the timer list is empty before rearming the timer
in the timer function to fix this.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 369edff5c22c6838cb632c24a1971f1ce6823991
tree b0f47f8469ed9fc47e8fc6b597b204aac816133a
parent ba609a9d97ba231c3d94443c50579ceb5fc33867
author Patrick McHardy <kaber@trash.net> Wed, 04 Jul 2007 17:45:26 +0200
committer Patrick McHardy <kaber@trash.net> Wed, 04 Jul 2007 17:45:26 +0200
net/core/gen_estimator.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 17daf4c..cc84d8d 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -128,7 +128,8 @@ static void est_timer(unsigned long arg)
spin_unlock(e->stats_lock);
}
- mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+ if (elist[idx].list != NULL)
+ mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
read_unlock(&est_lock);
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [NET]: Fix gen_estimator timer removal race
2007-07-04 15:47 [NET]: Fix gen_estimator timer removal race Patrick McHardy
@ 2007-07-05 5:48 ` Jarek Poplawski
2007-07-09 22:30 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jarek Poplawski @ 2007-07-05 5:48 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David Miller, Linux Netdev List
On Wed, Jul 04, 2007 at 05:47:51PM +0200, Patrick McHardy wrote:
> This is an updated version of the gen_estimator fix
> that relies on all changes happening under the rtnl
> and just fixes the race between timer rearming and
> timer removal.
>
>
> [NET]: Fix gen_estimator timer removal race
>
> As noticed by Jarek Poplawski <jarkao2@o2.pl>, the timer removal in
> gen_kill_estimator races with the timer function rearming the timer.
>
> Check whether the timer list is empty before rearming the timer
> in the timer function to fix this.
>
> Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Jarek Poplawski <jarkao2@o2.pl>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [NET]: Fix gen_estimator timer removal race
2007-07-05 5:48 ` Jarek Poplawski
@ 2007-07-09 22:30 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2007-07-09 22:30 UTC (permalink / raw)
To: jarkao2; +Cc: kaber, netdev
From: Jarek Poplawski <jarkao2@o2.pl>
Date: Thu, 5 Jul 2007 07:48:01 +0200
> On Wed, Jul 04, 2007 at 05:47:51PM +0200, Patrick McHardy wrote:
> > This is an updated version of the gen_estimator fix
> > that relies on all changes happening under the rtnl
> > and just fixes the race between timer rearming and
> > timer removal.
> >
> >
>
> > [NET]: Fix gen_estimator timer removal race
> >
> > As noticed by Jarek Poplawski <jarkao2@o2.pl>, the timer removal in
> > gen_kill_estimator races with the timer function rearming the timer.
> >
> > Check whether the timer list is empty before rearming the timer
> > in the timer function to fix this.
> >
> > Signed-off-by: Patrick McHardy <kaber@trash.net>
>
> Acked-by: Jarek Poplawski <jarkao2@o2.pl>
Applied, thanks guys.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-10 3:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-04 15:47 [NET]: Fix gen_estimator timer removal race Patrick McHardy
2007-07-05 5:48 ` Jarek Poplawski
2007-07-09 22:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).