From patchwork Fri Nov 16 19:26:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 12905 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 1B8F023E02 for ; Sun, 18 Nov 2012 01:33:07 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id B4C32A187F2 for ; Sun, 18 Nov 2012 01:33:06 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so168343iag.11 for ; Sat, 17 Nov 2012 17:33:06 -0800 (PST) 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:date:from :to:cc:subject:message-id:reply-to:mime-version:content-type :content-disposition:user-agent:x-content-scanned:x-cbid :x-gm-message-state; bh=AlvvQH7SAnvdT2e0qI1tsXOCNqjYbmqSCLNjDqH1moA=; b=LgRMCqBPsdPWUv7saJX1/BYHBPiDP83EpR0aTI/+nUyl/pgDPY/dOez5nfxwrFEDvr HTT5aWFujjCOV0IV2VVfyaYqBDn5O3yTvJMT2xG9QK94t9ouEyUB43cJ8ire2J75EBNa 5RkTOJpqRKzWqIuIfhNElvfNngjduiIsnooIKNTSEdRAPuzNMrIlmC+5lpvmD0g8ABHD lND/GpF05OVgJkUabVOw69eVxvFAB3/qiOzFMjTq5HedazX/Fb20xB91CCg98CbAbWh6 /hA+0PQvtruSEQUtFM5COEhCBCNONUajx0ncUOWHTK9YLjFpcdm7QON3baovZEUAAUv+ BCPA== Received: by 10.50.42.168 with SMTP id p8mr3136402igl.57.1353202386156; Sat, 17 Nov 2012 17:33:06 -0800 (PST) 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.50.67.148 with SMTP id n20csp2974igt; Sat, 17 Nov 2012 17:33:05 -0800 (PST) Received: by 10.50.53.193 with SMTP id d1mr2856951igp.69.1353202385505; Sat, 17 Nov 2012 17:33:05 -0800 (PST) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id ew5si5765618icc.91.2012.11.17.17.33.04 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Nov 2012 17:33:05 -0800 (PST) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 17 Nov 2012 18:33:04 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 17 Nov 2012 18:33:03 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 8EC5C19D803C for ; Sat, 17 Nov 2012 18:33:02 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAI1X2d2213984 for ; Sat, 17 Nov 2012 18:33:02 -0700 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 qAI1WweC028052 for ; Sat, 17 Nov 2012 18:33:01 -0700 Received: from paulmck-ThinkPad-W500 (sig-9-49-131-78.mts.ibm.com [9.49.131.78]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAI1WwaF028030; Sat, 17 Nov 2012 18:32:58 -0700 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id 196E5EBF1E; Fri, 16 Nov 2012 11:26:25 -0800 (PST) Date: Fri, 16 Nov 2012 11:26:25 -0800 From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, edumazet@google.com, darren@dvhart.com, fweisbec@gmail.com, sbw@mit.edu, patches@linaro.org Subject: [PATCH tip/core/rcu] Fix TINY_RCU rcu_is_cpu_rrupt_from_idle check Message-ID: <20121116192625.GA447@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12111801-7606-0000-0000-0000057ABF4B X-Gm-Message-State: ALoCoQmoPdAx52o2EExNAEdUPO2Goaufdc8L3LBQtxg28usvLyhLPVKfepf+m3gvHiLjTunSkIaA The rcu_is_cpu_rrupt_from_idle() needs to allow for one interrupt level from the idle loop, but TINY_RCU checks for a call from the idle loop itself. This commit fixes this issue. Reported-by: Josh Triplett Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney b/kernel/rcutiny.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index e4c6a59..e7dce58 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c @@ -195,7 +195,7 @@ EXPORT_SYMBOL(rcu_is_cpu_idle); */ int rcu_is_cpu_rrupt_from_idle(void) { - return rcu_dynticks_nesting <= 0; + return rcu_dynticks_nesting <= 1; } /*