From patchwork Sun Jun 23 13:43:14 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: 2767571 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 419D59F245 for ; Sun, 23 Jun 2013 13:46:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5038E20147 for ; Sun, 23 Jun 2013 13:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634EF20140 for ; Sun, 23 Jun 2013 13:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431Ab3FWNqn (ORCPT ); Sun, 23 Jun 2013 09:46:43 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:39904 "EHLO e28smtp03.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752355Ab3FWNqg (ORCPT ); Sun, 23 Jun 2013 09:46:36 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 23 Jun 2013 19:10:37 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 23 Jun 2013 19:10:34 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id AF9DB394004F; Sun, 23 Jun 2013 19:16:30 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5NDkkZ725493686; Sun, 23 Jun 2013 19:16:46 +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 r5NDkSZl007658; Sun, 23 Jun 2013 23:46:30 +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 r5NDkQBx007564; Sun, 23 Jun 2013 23:46:26 +1000 From: "Srivatsa S. Bhat" Subject: [PATCH 23/45] infiniband: ehca: 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, Hoang-Nam Nguyen , Christoph Raisch , Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org Date: Sun, 23 Jun 2013 19:13:14 +0530 Message-ID: <20130623134311.19094.9528.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-3864-0000-0000-000008C2BA23 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: Hoang-Nam Nguyen Cc: Christoph Raisch Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma@vger.kernel.org Signed-off-by: Srivatsa S. Bhat --- drivers/infiniband/hw/ehca/ehca_irq.c | 5 +++++ 1 file changed, 5 insertions(+) -- 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/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c index 8615d7c..ace901e 100644 --- a/drivers/infiniband/hw/ehca/ehca_irq.c +++ b/drivers/infiniband/hw/ehca/ehca_irq.c @@ -43,6 +43,7 @@ #include #include +#include #include "ehca_classes.h" #include "ehca_irq.h" @@ -703,6 +704,7 @@ static void queue_comp_task(struct ehca_cq *__cq) int cq_jobs; unsigned long flags; + get_online_cpus_atomic(); cpu_id = find_next_online_cpu(pool); BUG_ON(!cpu_online(cpu_id)); @@ -720,6 +722,7 @@ static void queue_comp_task(struct ehca_cq *__cq) BUG_ON(!cct || !thread); } __queue_comp_task(__cq, cct, thread); + put_online_cpus_atomic(); } static void run_comp_task(struct ehca_cpu_comp_task *cct) @@ -759,6 +762,7 @@ static void comp_task_park(unsigned int cpu) list_splice_init(&cct->cq_list, &list); spin_unlock_irq(&cct->task_lock); + get_online_cpus_atomic(); cpu = find_next_online_cpu(pool); target = per_cpu_ptr(pool->cpu_comp_tasks, cpu); thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu); @@ -768,6 +772,7 @@ static void comp_task_park(unsigned int cpu) __queue_comp_task(cq, target, thread); } spin_unlock_irq(&target->task_lock); + put_online_cpus_atomic(); } static void comp_task_stop(unsigned int cpu, bool online)