From patchwork Tue Jul 17 06:39:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10023 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 D72BB23E56 for ; Tue, 17 Jul 2012 06:40:46 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id A65B1A181CC for ; Tue, 17 Jul 2012 06:40:46 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so51729ghb.11 for ; Mon, 16 Jul 2012 23:40:46 -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=VmKh/MLcEey1es5TqHfM5dv7IMclEO1W6BNOgnss+FM=; b=FTt3pJXcVgCozmHrtwQPT0eBq/N8KFN96bhyQHSdNshTtM25PU185nC9pjaZ8t0142 IqR1prvEv9irT/RBH9G7vn41OeCAt32K4UMYbofyNBQksR8DduQzoMGfMFcyu9KojhGZ pxXDjk24PMJgv4vX0hpQFrPPg0djgdLke53tqxmRVuGfNuZNYelwHxJHCDjkSPizkJeX wvOpz02HeePQeM/QG5JogzfDzPo1yVHazt40SInGmhGtOsX+4/5TvUTeJVRo9ouQKl3c 2NxS1dE8Zxm6mzMnpeKgwy0MxKptaVz4reYEdiUUm3vJRb4jK7K/v+zQe7LGROEuuNrP 3SoA== Received: by 10.50.57.167 with SMTP id j7mr385898igq.53.1342507246242; Mon, 16 Jul 2012 23:40:46 -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.241.2 with SMTP id lc2csp15745ibb; Mon, 16 Jul 2012 23:40:45 -0700 (PDT) Received: by 10.182.167.41 with SMTP id zl9mr1643230obb.43.1342507245328; Mon, 16 Jul 2012 23:40:45 -0700 (PDT) Received: from e37.co.us.ibm.com (e37.co.us.ibm.com. [32.97.110.158]) by mx.google.com with ESMTPS id s6si17425759obw.44.2012.07.16.23.40.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Jul 2012 23:40:45 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.158 as permitted sender) client-ip=32.97.110.158; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.158 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 00:40:44 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 00:40:13 -0600 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 0166FC9006A for ; Tue, 17 Jul 2012 02:40:13 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6H6eBg334865376 for ; Tue, 17 Jul 2012 02:40:11 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HCB4S4020910 for ; Tue, 17 Jul 2012 08:11:04 -0400 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HCB4cA020889; Tue, 17 Jul 2012 08:11:04 -0400 From: John Stultz To: stable@vger.kernel.org Cc: Thomas Gleixner , John Stultz , Prarit Bhargava , Linux Kernel Subject: [PATCH 4/7] 3.4.x: hrtimers: Move lock held region in hrtimer_interrupt() Date: Tue, 17 Jul 2012 02:39:53 -0400 Message-Id: <1342507196-54327-5-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342507196-54327-1-git-send-email-johnstul@us.ibm.com> References: <1342507196-54327-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071706-7408-0000-0000-000006D22394 X-Gm-Message-State: ALoCoQkP9Cw418GMhGUR0pQwborPHZpx+Giws7dWK/4U5ATTbAhycZVS5RNsqr9/J2q6/q3km56n From: Thomas Gleixner 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 Reviewed-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Prarit Bhargava Cc: stable@vger.kernel.org Signed-off-by: John Stultz Link: http://lkml.kernel.org/r/1341960205-56738-6-git-send-email-johnstul@us.ibm.com Signed-off-by: Thomas Gleixner Cc: Prarit Bhargava Cc: Thomas Gleixner Cc: Linux Kernel Signed-off-by: John Stultz --- kernel/hrtimer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 3c24fb2..8f320af 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; + raw_spin_lock(&cpu_base->lock); entry_time = now = ktime_get(); retry: expires_next.tv64 = KTIME_MAX; - - raw_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 @@ -1344,6 +1343,7 @@ retry: * interrupt routine. We give it 3 attempts to avoid * overreacting on some spurious event. */ + raw_spin_lock(&cpu_base->lock); now = ktime_get(); cpu_base->nr_retries++; if (++retries < 3) @@ -1356,6 +1356,7 @@ retry: */ cpu_base->nr_hangs++; cpu_base->hang_detected = 1; + raw_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;