From patchwork Thu Aug 30 21:05:32 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: 11076 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 16A6023E52 for ; Thu, 30 Aug 2012 21:14:01 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 63E06A192C9 for ; Thu, 30 Aug 2012 21:13:24 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so1133172iea.11 for ; Thu, 30 Aug 2012 14:14:00 -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=oWOwLxkkpc3+DYAdiw2Lrz7WXjAV9a5t/8ACsyvfTK4=; b=F1h16wuZsVSg3CgHK4E53ZOWvRyQfuKL2tVuI1tmxiY3z918AmR2g3vOstLb3CzsDA 5JexJBRTPRaSWQiBU/FKajQAnmvROcMEaVcVTRFdfkvMLCgBJ7YIr+wFcL4D7GHPQYax zEQfYQ6R6Bsli5BlzDwiLfN/G4DsHNP+2qHLQg0cm+T1ZMuC/VGycsvt/nDySLu2M7/9 YTYqffwb6VqYSsrAYXEt3sR/LpRA6uW86m1z7gTmM/7s46tPEoPGdCGjrmg4Xozk7BaD 623gFQmxpO81Pva74RXIg8EYnWO3l8bv5G6UkbZA1BS1u5TSV/+Z2u+hgSOnWAyIaWfR zxRQ== Received: by 10.50.237.41 with SMTP id uz9mr2361508igc.43.1346361240366; Thu, 30 Aug 2012 14:14:00 -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.50.184.232 with SMTP id ex8csp31631igc; Thu, 30 Aug 2012 14:13:59 -0700 (PDT) Received: by 10.182.49.102 with SMTP id t6mr6072973obn.94.1346361239409; Thu, 30 Aug 2012 14:13:59 -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 zm6si3488596obb.145.2012.08.30.14.13.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Aug 2012 14:13:59 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.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 paulmck@linux.vnet.ibm.com designates 32.97.110.153 as permitted sender) smtp.mail=paulmck@linux.vnet.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 ; Thu, 30 Aug 2012 15:13:58 -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; Thu, 30 Aug 2012 15:13:56 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 9DA7D19D8042 for ; Thu, 30 Aug 2012 15:13:55 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7ULDtni139614 for ; Thu, 30 Aug 2012 15:13:55 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7ULDZwb009385 for ; Thu, 30 Aug 2012 15:13:45 -0600 Received: from paulmck-ThinkPad-W500 (sig-9-65-153-225.mts.ibm.com [9.65.153.225]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7ULDY5n009177; Thu, 30 Aug 2012 15:13:35 -0600 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id D4146EA848; Thu, 30 Aug 2012 14:05:46 -0700 (PDT) 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@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, fweisbec@gmail.com, sbw@mit.edu, patches@linaro.org, Richard Henderson , Ivan Kokshaysky , Matt Turner , alpha , "Paul E. McKenney" , Michael Cree Subject: [PATCH tip/core/rcu 15/26] alpha: Fix preemption handling in idle loop Date: Thu, 30 Aug 2012 14:05:32 -0700 Message-Id: <1346360743-3628-15-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1346360743-3628-1-git-send-email-paulmck@linux.vnet.ibm.com> References: <20120830210520.GA2824@linux.vnet.ibm.com> <1346360743-3628-1-git-send-email-paulmck@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12083021-6148-0000-0000-000009175F31 X-Gm-Message-State: ALoCoQnqsegZG4W2FWYx/D4SreH6Odth2hEbqiN9YMbcPXUpw5aWggN/EoyP4eyXmPnUA6gsCbji From: Frederic Weisbecker cpu_idle() is called on the boot CPU by the init code with preemption disabled. But the cpu_idle() function in alpha doesn't handle this when it calls schedule() directly. Fix it by converting it into schedule_preempt_disabled(). Also disable preemption before calling cpu_idle() from secondary CPU entry code to stay consistent with this state. Signed-off-by: Frederic Weisbecker Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: alpha Cc: Paul E. McKenney Cc: Michael Cree Reviewed-by: Josh Triplett --- arch/alpha/kernel/process.c | 3 ++- arch/alpha/kernel/smp.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 153d3fc..eac5e01 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -56,7 +56,8 @@ cpu_idle(void) while (!need_resched()) cpu_relax(); - schedule(); + + schedule_preempt_disabled(); } } diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 35ddc02..a41ad90 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -166,6 +166,7 @@ smp_callin(void) DBGS(("smp_callin: commencing CPU %d current %p active_mm %p\n", cpuid, current, current->active_mm)); + preempt_disable(); /* Do nothing. */ cpu_idle(); }