From patchwork Tue Jul 17 21:49:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10082 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 5BFDB23E3D for ; Tue, 17 Jul 2012 21:49:53 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2A6B1A181FE for ; Tue, 17 Jul 2012 21:49:53 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so1041054ggn.11 for ; Tue, 17 Jul 2012 14:49:53 -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=ZN0xNN/F4xmvRQq4a+TC5pyWhYWacy9+HF2p7e1LdHA=; b=NJN1n5gktJBgtnCzUhaF1N9ApQRZcY31o5dTdFanpQ0nIczzN+krfMUpJhkOKWuG/E pGIBCf00dPYfgVHWuJpMQimHivA6rjzqP5m5LbiVDjsE7Kix+INKoA8eNugKPXNijDSD n2OqdYTPHOgz4XU5OLvW/iTxThO9vVt/aO/SrNVgTiay3GoHsArXyznJNLn9E5XXSSVA NEXqCETHMWfdtfoy0clsnCTkJFOwYmBwm1Bx6kXh1Ogdrlk43MXwNYMnMpGcPRYwgmB9 nHAjXjSWqjrAzw/yKfbKqYiYXjxneLkl38oP2MeAH2GYLCj/uQ7OU/EY9byrU3zFDuqD oanQ== Received: by 10.50.193.196 with SMTP id hq4mr155890igc.57.1342561792656; Tue, 17 Jul 2012 14:49:52 -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 lc2csp24871ibb; Tue, 17 Jul 2012 14:49:51 -0700 (PDT) Received: by 10.50.95.231 with SMTP id dn7mr223327igb.18.1342561790895; Tue, 17 Jul 2012 14:49:50 -0700 (PDT) Received: from e35.co.us.ibm.com (e35.co.us.ibm.com. [32.97.110.153]) by mx.google.com with ESMTPS id l10si26570263icz.31.2012.07.17.14.49.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 14:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.153 as permitted sender) client-ip=32.97.110.153; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.153 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 15:49:50 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 15:49:48 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 098E819D8051 for ; Tue, 17 Jul 2012 21:49:46 +0000 (WET) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HLnlct159622 for ; Tue, 17 Jul 2012 15:49:47 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HLnhma026834 for ; Tue, 17 Jul 2012 15:49:43 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HLnZI6026401; Tue, 17 Jul 2012 15:49:42 -0600 From: John Stultz To: stable@vger.kernel.org Cc: Thomas Gleixner , John Stultz , Prarit Bhargava , Linux Kernel Subject: [PATCH 08/11] 2.6.34.x: hrtimers: Move lock held region in hrtimer_interrupt() Date: Tue, 17 Jul 2012 17:49:28 -0400 Message-Id: <1342561771-55678-9-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342561771-55678-1-git-send-email-johnstul@us.ibm.com> References: <1342561771-55678-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071721-6148-0000-0000-000007BF8C7F X-Gm-Message-State: ALoCoQkWH9eaeuCrm/iz1LmfCbHr5RkGCpqZX1HZQAl1X/hYhdm9S8J6HjIYA2NaaCAN4EscVbF3 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 dc41268..039db35 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1279,11 +1279,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 @@ -1358,6 +1357,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) @@ -1370,6 +1370,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;