From: John Stultz <john.stultz@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: John Stultz <john.stultz@linaro.org>
Subject: [PATCH 05/12] hrtimer: fix timerqueue conversion flub
Date: Wed, 5 Jan 2011 18:15:52 -0800 [thread overview]
Message-ID: <1294280159-2513-6-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1294280159-2513-1-git-send-email-john.stultz@linaro.org>
In converting the hrtimers to timerqueue, I missed
a spot in hrtimer_run_queues where we loop running
timers. We end up not pulling the new next value out
and instead just use the last next value, causing
boot time hangs in some cases.
The proper fix is to pull timerqueue_getnext each iteration
instead of using a local next value.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
kernel/hrtimer.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f5aaea2..f2429fc 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1420,11 +1420,8 @@ void hrtimer_run_queues(void)
return;
for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) {
- struct timerqueue_node *next;
-
base = &cpu_base->clock_base[index];
- next = timerqueue_getnext(&base->active);
- if (!next)
+ if (!timerqueue_getnext(&base->active))
continue;
if (gettime) {
@@ -1434,7 +1431,7 @@ void hrtimer_run_queues(void)
raw_spin_lock(&cpu_base->lock);
- while ((node = next)) {
+ while ((node = timerqueue_getnext(&base->active))) {
struct hrtimer *timer;
timer = container_of(node, struct hrtimer, node);
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-01-06 2:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 2:15 [PATCH 00/12] Posix Alarm Timers full patchset John Stultz
2011-01-06 2:15 ` [PATCH 01/12] timers: Introduce timerlist infrastructure John Stultz
2011-01-06 2:15 ` [PATCH 02/12] timers: Rename timerlist infrastructure to timerqueue John Stultz
2011-01-06 2:15 ` [PATCH 03/12] timers: Fixup allmodconfig build issue John Stultz
2011-01-06 2:15 ` [PATCH 04/12] hrtimers: Convert hrtimers to use timerlist infrastructure John Stultz
2011-01-06 2:15 ` John Stultz [this message]
2011-01-06 2:15 ` [PATCH 06/12] RTC: Rework RTC code to use timerqueue for events John Stultz
2011-01-06 2:15 ` [PATCH 07/12] RTC: Remove UIE emulation John Stultz
2011-01-06 2:15 ` [PATCH 08/12] rtc: Namespace fixup John Stultz
2011-01-06 2:15 ` [PATCH 09/12] [RFC] hrtimers: extend hrtimer base code to handle more then 2 clockids John Stultz
2011-01-06 2:15 ` [PATCH 10/12] [RFC] hrtimers: Add CLOCK_BOOTTIME clockid, hrtimerbase and posix interface John Stultz
2011-01-06 2:15 ` [PATCH 11/12] timers: Add rb_init_node() to allow for stack allocated rb nodes John Stultz
2011-01-06 2:15 ` [PATCH 12/12] [RFC] Introduce Alarm (hybrid) timers John Stultz
2011-01-06 4:07 ` Arve Hjønnevåg
2011-01-06 18:04 ` John Stultz
2011-01-07 0:58 ` Arve Hjønnevåg
2011-01-07 2:30 ` John Stultz
2011-01-08 10:36 ` Rafael J. Wysocki
2011-01-13 5:03 ` Arve Hjønnevåg
2011-01-11 18:56 ` John Stultz
2011-01-11 19:22 ` Anca Emanuel
2011-01-13 4:50 ` Arve Hjønnevåg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294280159-2513-6-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®