From patchwork Tue Jun 25 20:33:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srivatsa S. Bhat" X-Patchwork-Id: 2780711 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1766C0AB1 for ; Tue, 25 Jun 2013 20:39:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8E61204C9 for ; Tue, 25 Jun 2013 20:39:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBD7E204BC for ; Tue, 25 Jun 2013 20:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526Ab3FYUgc (ORCPT ); Tue, 25 Jun 2013 16:36:32 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:40591 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754048Ab3FYUg0 (ORCPT ); Tue, 25 Jun 2013 16:36:26 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Jun 2013 01:57:44 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 26 Jun 2013 01:57:41 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id A5842E0053; Wed, 26 Jun 2013 02:05:53 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5PKaa5O22741218; Wed, 26 Jun 2013 02:06:36 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5PKaIBl030842; Wed, 26 Jun 2013 06:36:21 +1000 Received: from srivatsabhat.in.ibm.com ([9.79.199.80]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5PKaHb7030796; Wed, 26 Jun 2013 06:36:17 +1000 From: "Srivatsa S. Bhat" Subject: [PATCH v2 39/45] mn10300: Use get/put_online_cpus_atomic() to prevent CPU offline To: tglx@linutronix.de, peterz@infradead.org, tj@kernel.org, oleg@redhat.com, paulmck@linux.vnet.ibm.com, rusty@rustcorp.com.au, mingo@kernel.org, akpm@linux-foundation.org, namhyung@kernel.org, walken@google.com, vincent.guittot@linaro.org, laijs@cn.fujitsu.com Cc: rostedt@goodmis.org, wangyun@linux.vnet.ibm.com, xiaoguangrong@linux.vnet.ibm.com, sbw@mit.edu, fweisbec@gmail.com, zhong@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com, srivatsa.bhat@linux.vnet.ibm.com, linux-pm@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , Koichi Yasutake , linux-am33-list@redhat.com, "Srivatsa S. Bhat" Date: Wed, 26 Jun 2013 02:03:04 +0530 Message-ID: <20130625203303.16593.37863.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20130625202452.16593.22810.stgit@srivatsabhat.in.ibm.com> References: <20130625202452.16593.22810.stgit@srivatsabhat.in.ibm.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062520-2000-0000-0000-00000CA2DC63 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Once stop_machine() is gone from the CPU offline path, we won't be able to depend on disabling preemption to prevent CPUs from going offline from under us. Use the get/put_online_cpus_atomic() APIs to prevent CPUs from going offline, while invoking from atomic context. Cc: David Howells Cc: Koichi Yasutake Cc: linux-am33-list@redhat.com Signed-off-by: Srivatsa S. Bhat --- arch/mn10300/mm/cache-smp.c | 3 +++ arch/mn10300/mm/tlb-smp.c | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/mn10300/mm/cache-smp.c b/arch/mn10300/mm/cache-smp.c index 2d23b9e..406357d 100644 --- a/arch/mn10300/mm/cache-smp.c +++ b/arch/mn10300/mm/cache-smp.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,7 @@ void smp_cache_interrupt(void) void smp_cache_call(unsigned long opr_mask, unsigned long start, unsigned long end) { + get_online_cpus_atomic(); smp_cache_mask = opr_mask; smp_cache_start = start; smp_cache_end = end; @@ -102,4 +104,5 @@ void smp_cache_call(unsigned long opr_mask, while (!cpumask_empty(&smp_cache_ipi_map)) /* nothing. lockup detection does not belong here */ mb(); + put_online_cpus_atomic(); } diff --git a/arch/mn10300/mm/tlb-smp.c b/arch/mn10300/mm/tlb-smp.c index 3e57faf..8856fd3 100644 --- a/arch/mn10300/mm/tlb-smp.c +++ b/arch/mn10300/mm/tlb-smp.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,7 @@ void smp_flush_tlb(void *unused) { unsigned long cpu_id; - cpu_id = get_cpu(); + cpu_id = get_online_cpus_atomic(); if (!cpumask_test_cpu(cpu_id, &flush_cpumask)) /* This was a BUG() but until someone can quote me the line @@ -82,7 +83,7 @@ void smp_flush_tlb(void *unused) cpumask_clear_cpu(cpu_id, &flush_cpumask); smp_mb__after_clear_bit(); out: - put_cpu(); + put_online_cpus_atomic(); } /** @@ -144,7 +145,7 @@ void flush_tlb_mm(struct mm_struct *mm) { cpumask_t cpu_mask; - preempt_disable(); + get_online_cpus_atomic(); cpumask_copy(&cpu_mask, mm_cpumask(mm)); cpumask_clear_cpu(smp_processor_id(), &cpu_mask); @@ -152,7 +153,7 @@ void flush_tlb_mm(struct mm_struct *mm) if (!cpumask_empty(&cpu_mask)) flush_tlb_others(cpu_mask, mm, FLUSH_ALL); - preempt_enable(); + put_online_cpus_atomic(); } /** @@ -163,7 +164,7 @@ void flush_tlb_current_task(void) struct mm_struct *mm = current->mm; cpumask_t cpu_mask; - preempt_disable(); + get_online_cpus_atomic(); cpumask_copy(&cpu_mask, mm_cpumask(mm)); cpumask_clear_cpu(smp_processor_id(), &cpu_mask); @@ -171,7 +172,7 @@ void flush_tlb_current_task(void) if (!cpumask_empty(&cpu_mask)) flush_tlb_others(cpu_mask, mm, FLUSH_ALL); - preempt_enable(); + put_online_cpus_atomic(); } /** @@ -184,7 +185,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va) struct mm_struct *mm = vma->vm_mm; cpumask_t cpu_mask; - preempt_disable(); + get_online_cpus_atomic(); cpumask_copy(&cpu_mask, mm_cpumask(mm)); cpumask_clear_cpu(smp_processor_id(), &cpu_mask); @@ -192,7 +193,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va) if (!cpumask_empty(&cpu_mask)) flush_tlb_others(cpu_mask, mm, va); - preempt_enable(); + put_online_cpus_atomic(); } /**