From patchwork Tue Jul 3 02:16:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 9771 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5AE0C23E37 for ; Tue, 3 Jul 2012 02:16:32 +0000 (UTC) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by fiordland.canonical.com (Postfix) with ESMTP id 0DA2EA1861D for ; Tue, 3 Jul 2012 02:16:31 +0000 (UTC) Received: by yhjj63 with SMTP id j63so5859880yhj.37 for ; Mon, 02 Jul 2012 19:16:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=YbTvsmEQUArG43NwPo9x8rJheEzUnuJnA/ZtAP0/BRw=; b=n9huuGq2O+EGkBaHZcyvHC47wut9arM0rc6mUQwA+MpERMZ7zmnysECFN+rl0HfoHi w1rmf8URyZXIFx2jelT1DZsjuJ7+g3a9ILg5eNfZ2AakogcCs1pYNJ/3VrBjprEeWUfC 4gEk6INlp2UocKdrEROdpfYSucnRFGRHFSXupS4g2bbEApeoQtaDkG7HGlfm4vFerTva sb/2vHbTNNJf47RDs7Ui1TNM+/XREVkReWlKrxR4EyElOh6EGlYz0cfkyGg0zaqynl4C wnFVlBQzv5HKiz0znz6z+oyy8r0tz/mrGfJNMX3CtbPTwCGH7wFFITQa7KTvBSuI5E+Q Fwzw== Received: by 10.50.195.234 with SMTP id ih10mr7062000igc.0.1341281791281; Mon, 02 Jul 2012 19:16:31 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp33966ibb; Mon, 2 Jul 2012 19:16:30 -0700 (PDT) Received: by 10.50.91.233 with SMTP id ch9mr8803604igb.8.1341281790599; Mon, 02 Jul 2012 19:16:30 -0700 (PDT) Received: from e2.ny.us.ibm.com (e2.ny.us.ibm.com. [32.97.182.142]) by mx.google.com with ESMTPS id ef4si14916284icb.75.2012.07.02.19.16.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jul 2012 19:16:30 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.142 as permitted sender) client-ip=32.97.182.142; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.142 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e2.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jul 2012 22:16:28 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e2.ny.us.ibm.com (192.168.1.102) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 2 Jul 2012 22:16:27 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 8A9AC38C805E for ; Mon, 2 Jul 2012 22:16:26 -0400 (EDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q632GPlb430932 for ; Mon, 2 Jul 2012 22:16:26 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q632GP5T003400 for ; Mon, 2 Jul 2012 20:16:25 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q632GMSB003254; Mon, 2 Jul 2012 20:16:23 -0600 From: John Stultz To: Linux Kernel Cc: John Stultz , Prarit Bhargava , stable@vger.kernel.org, Thomas Gleixner Subject: [PATCH 1/3] [RFC] hrtimer: Fix clock_was_set so it is safe to call from atomic Date: Mon, 2 Jul 2012 22:16:04 -0400 Message-Id: <1341281766-22722-2-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341281766-22722-1-git-send-email-johnstul@us.ibm.com> References: <1341281766-22722-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12070302-5112-0000-0000-000009B33527 X-Gm-Message-State: ALoCoQl4MeU204phN33B4VlHrYtzdChH352U1S3kLL9ooXgMICSGfWQEEORPJytpxe/OJK49Gz4v 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, if clock_was_set is called we're in_atomic, we schedule a timer to fire for immedately after we're out of interrupt context to then notify the hrtimer subsystem. CC: Prarit Bhargava CC: stable@vger.kernel.org CC: Thomas Gleixner Reported-by: Jan Engelhardt Signed-off-by: John Stultz --- kernel/hrtimer.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index ae34bf5..393fd4d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -746,7 +746,7 @@ static inline 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(unsigned long data) { #ifdef CONFIG_HIGH_RES_TIMERS /* Retrigger the CPU local events everywhere */ @@ -755,6 +755,21 @@ void clock_was_set(void) timerfd_clock_was_set(); } +static struct timer_list clock_was_set_timer; + +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 + * via a timer_list timer for right after. + */ + if (in_atomic()) + mod_timer(&clock_was_set_timer, jiffies); + else + do_clock_was_set(0); +} + /* * During resume we might have to reprogram the high resolution timer * interrupt (on the local CPU): @@ -1152,6 +1167,8 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, base = hrtimer_clockid_to_base(clock_id); timer->base = &cpu_base->clock_base[base]; timerqueue_init(&timer->node); + init_timer(&clock_was_set_timer); + clock_was_set_timer.function = do_clock_was_set; #ifdef CONFIG_TIMER_STATS timer->start_site = NULL;