From patchwork Sun Jun 23 13:46:09 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: 2768011 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E039C9F8E1 for ; Sun, 23 Jun 2013 13:52:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 078C820184 for ; Sun, 23 Jun 2013 13:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 580B52018B for ; Sun, 23 Jun 2013 13:52:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855Ab3FWNtg (ORCPT ); Sun, 23 Jun 2013 09:49:36 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:52274 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895Ab3FWNtb (ORCPT ); Sun, 23 Jun 2013 09:49:31 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 23 Jun 2013 19:10:54 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 23 Jun 2013 19:10:51 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 37BAC1258043; Sun, 23 Jun 2013 19:18:26 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5NDnL5l25886750; Sun, 23 Jun 2013 19:19:21 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5NDnMNb013079; Sun, 23 Jun 2013 23:49:24 +1000 Received: from srivatsabhat.in.ibm.com ([9.79.195.141]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5NDnL9l013012; Sun, 23 Jun 2013 23:49:21 +1000 From: "Srivatsa S. Bhat" Subject: [PATCH 36/45] ia64: smp, tlb: 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, Tony Luck , Fenghua Yu , linux-ia64@vger.kernel.org Date: Sun, 23 Jun 2013 19:16:09 +0530 Message-ID: <20130623134605.19094.47993.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20130623133642.19094.16038.stgit@srivatsabhat.in.ibm.com> References: <20130623133642.19094.16038.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: 13062313-2000-0000-0000-00000C9A1D73 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.0 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: Tony Luck Cc: Fenghua Yu Cc: linux-ia64@vger.kernel.org Signed-off-by: Srivatsa S. Bhat --- arch/ia64/kernel/smp.c | 12 ++++++------ arch/ia64/mm/tlb.c | 4 ++-- 2 files changed, 8 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/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 9fcd4e6..25991ba 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -259,8 +260,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask) cpumask_t cpumask = xcpumask; int mycpu, cpu, flush_mycpu = 0; - preempt_disable(); - mycpu = smp_processor_id(); + mycpu = get_online_cpus_atomic(); for_each_cpu_mask(cpu, cpumask) counts[cpu] = local_tlb_flush_counts[cpu].count & 0xffff; @@ -280,7 +280,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask) while(counts[cpu] == (local_tlb_flush_counts[cpu].count & 0xffff)) udelay(FLUSH_DELAY); - preempt_enable(); + put_online_cpus_atomic(); } void @@ -293,12 +293,12 @@ void smp_flush_tlb_mm (struct mm_struct *mm) { cpumask_var_t cpus; - preempt_disable(); + get_online_cpus_atomic(); /* this happens for the common case of a single-threaded fork(): */ if (likely(mm == current->active_mm && atomic_read(&mm->mm_users) == 1)) { local_finish_flush_tlb_mm(mm); - preempt_enable(); + put_online_cpus_atomic(); return; } if (!alloc_cpumask_var(&cpus, GFP_ATOMIC)) { @@ -313,7 +313,7 @@ smp_flush_tlb_mm (struct mm_struct *mm) local_irq_disable(); local_finish_flush_tlb_mm(mm); local_irq_enable(); - preempt_enable(); + put_online_cpus_atomic(); } void arch_send_call_function_single_ipi(int cpu) diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index ed61297..8c55ef5 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c @@ -87,11 +87,11 @@ wrap_mmu_context (struct mm_struct *mm) * can't call flush_tlb_all() here because of race condition * with O(1) scheduler [EF] */ - cpu = get_cpu(); /* prevent preemption/migration */ + cpu = get_online_cpus_atomic(); /* prevent preemption/migration */ for_each_online_cpu(i) if (i != cpu) per_cpu(ia64_need_tlb_flush, i) = 1; - put_cpu(); + put_online_cpus_atomic(); local_flush_tlb_all(); }