From patchwork Tue Jul 3 02:17:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2, NATTY] (pre-upstream) Fix clock_was_set so it is safe to call from atomic Date: Mon, 02 Jul 2012 16:17:51 -0000 From: Brad Figg X-Patchwork-Id: 168672 Message-Id: <1341281876-28601-4-git-send-email-brad.figg@canonical.com> To: kernel-team@lists.ubuntu.com From: John Stultz BugLink: http://bugs.launchpad.net/bugs/1020285 Backport for 2.6.32.59 NOTE:This is a prerequisite patch that's required to address the widely observed leap-second related futex/hrtimer issues. Currently clock_was_set() is unsafe to be called from atomic context, as it calls on_each_cpu(). This causes problems when we need to adjust the time from update_wall_time(). To fix this, introduce a work_struct so if we're in_atomic, we can schedule work to do the necessary update after we're out of the atomic section. CC: Prarit Bhargava CC: stable@vger.kernel.org CC: Thomas Gleixner Reported-by: Jan Engelhardt Signed-off-by: John Stultz Signed-off-by: Brad Figg --- kernel/hrtimer.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 0c8d7c0..3b2b20c 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -645,11 +645,26 @@ static void retrigger_next_event(void *arg) * resolution timer interrupts. On UP we just disable interrupts and * call the high resolution interrupt code. */ -void clock_was_set(void) +static void do_clock_was_set(struct work_struct *work) { /* Retrigger the CPU local events everywhere */ on_each_cpu(retrigger_next_event, NULL, 1); } +static DECLARE_WORK(clock_was_set_work, do_clock_was_set); + +void clock_was_set(void) +{ + /* + * We can't call on_each_cpu() from atomic context, + * so if we're in_atomic, schedule the clock_was_set + * for later. + */ + if (in_atomic()) + schedule_work(&clock_was_set_work); + else + do_clock_was_set(NULL); +} + /* * During resume we might have to reprogram the high resolution timer