From: John Stultz <johnstul@us.ibm.com>
To: stable@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
John Stultz <johnstul@us.ibm.com>,
Prarit Bhargava <prarit@redhat.com>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH 08/11] 2.6.32.x: hrtimers: Move lock held region in hrtimer_interrupt()
Date: Tue, 17 Jul 2012 18:05:32 -0400 [thread overview]
Message-ID: <1342562735-55870-9-git-send-email-johnstul@us.ibm.com> (raw)
In-Reply-To: <1342562735-55870-1-git-send-email-johnstul@us.ibm.com>
From: Thomas Gleixner <tglx@linutronix.de>
This is a backport of 196951e91262fccda81147d2bcf7fdab08668b40
We need to update the base offsets from this code and we need to do
that under base->lock. Move the lock held region around the
ktime_get() calls. The ktime_get() calls are going to be replaced with
a function which gets the time and the offsets atomically.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Prarit Bhargava <prarit@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Link: http://lkml.kernel.org/r/1341960205-56738-6-git-send-email-johnstul@us.ibm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
kernel/hrtimer.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index c4acec7..8ba6d31 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1263,11 +1263,10 @@ void hrtimer_interrupt(struct clock_event_device *dev)
cpu_base->nr_events++;
dev->next_event.tv64 = KTIME_MAX;
+ spin_lock(&cpu_base->lock);
entry_time = now = ktime_get();
retry:
expires_next.tv64 = KTIME_MAX;
-
- spin_lock(&cpu_base->lock);
/*
* We set expires_next to KTIME_MAX here with cpu_base->lock
* held to prevent that a timer is enqueued in our queue via
@@ -1342,6 +1341,7 @@ retry:
* interrupt routine. We give it 3 attempts to avoid
* overreacting on some spurious event.
*/
+ spin_lock(&cpu_base->lock);
now = ktime_get();
cpu_base->nr_retries++;
if (++retries < 3)
@@ -1354,6 +1354,7 @@ retry:
*/
cpu_base->nr_hangs++;
cpu_base->hang_detected = 1;
+ spin_unlock(&cpu_base->lock);
delta = ktime_sub(now, entry_time);
if (delta.tv64 > cpu_base->max_hang_time.tv64)
cpu_base->max_hang_time = delta;
--
1.7.9.5
next prev parent reply other threads:[~2012-07-17 22:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 22:05 [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-17 22:05 ` [PATCH 01/11] 2.6.32.x: ntp: Fix leap-second hrtimer livelock John Stultz
2012-07-17 22:05 ` [PATCH 02/11] 2.6.32.x: ntp: Correct TAI offset during leap second John Stultz
2012-07-17 22:05 ` [PATCH 03/11] 2.6.32.x: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond John Stultz
2012-07-17 22:05 ` [PATCH 04/11] 2.6.32.x: time: Move common updates to a function John Stultz
2012-07-17 22:05 ` [PATCH 05/11] 2.6.32.x: hrtimer: Provide clock_was_set_delayed() John Stultz
2012-07-17 22:05 ` [PATCH 06/11] 2.6.32.x: timekeeping: Fix leapsecond triggered load spike issue John Stultz
2012-07-17 22:05 ` [PATCH 07/11] 2.6.32.x: timekeeping: Maintain ktime_t based offsets for hrtimers John Stultz
2012-07-17 22:05 ` John Stultz [this message]
2012-07-17 22:05 ` [PATCH 09/11] 2.6.32.x: timekeeping: Provide hrtimer update function John Stultz
2012-07-17 22:05 ` [PATCH 10/11] 2.6.32.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt John Stultz
2012-07-17 22:05 ` [PATCH 11/11] 2.6.32.x: timekeeping: Add missing update call in timekeeping_resume() John Stultz
2012-07-18 0:34 ` [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-19 9:53 ` Willy Tarreau
2012-07-19 12:56 ` Willy Tarreau
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=1342562735-55870-9-git-send-email-johnstul@us.ibm.com \
--to=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=prarit@redhat.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).