From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753704AbbKWQXd (ORCPT ); Mon, 23 Nov 2015 11:23:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44472 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbbKWQXb (ORCPT ); Mon, 23 Nov 2015 11:23:31 -0500 Date: Mon, 23 Nov 2015 08:22:50 -0800 From: tip-bot for Oleg Nesterov Message-ID: Cc: oleg@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, milos@redhat.com, tj@kernel.org, efault@gmx.de, prarit@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org, tj@kernel.org, efault@gmx.de, prarit@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, milos@redhat.com, oleg@redhat.com, mingo@kernel.org In-Reply-To: <20151115193323.GA8262@redhat.com> References: <20151115193323.GA8262@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] stop_machine: Change __stop_cpus() to rely on cpu_stop_queue_work() Git-Commit-ID: 4aff1ca6970afbf9cd916c34a9c442c8ccba905e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4aff1ca6970afbf9cd916c34a9c442c8ccba905e Gitweb: http://git.kernel.org/tip/4aff1ca6970afbf9cd916c34a9c442c8ccba905e Author: Oleg Nesterov AuthorDate: Sun, 15 Nov 2015 20:33:23 +0100 Committer: Ingo Molnar CommitDate: Mon, 23 Nov 2015 09:48:19 +0100 stop_machine: Change __stop_cpus() to rely on cpu_stop_queue_work() Change queue_stop_cpus_work() to return true if it queues at least one work, this means that the caller should wait. __stop_cpus() can check the value returned by queue_stop_cpus_work() and avoid done.executed, just like stop_one_cpu() does. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra (Intel) Acked-by: Tejun Heo Cc: Linus Torvalds Cc: Mike Galbraith Cc: Milos Vyletel Cc: Peter Zijlstra Cc: Prarit Bhargava Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20151115193323.GA8262@redhat.com Signed-off-by: Ingo Molnar --- kernel/stop_machine.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 68b73c4..ed2019a 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -318,12 +318,13 @@ bool stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg, /* static data for stop_cpus */ static DEFINE_MUTEX(stop_cpus_mutex); -static void queue_stop_cpus_work(const struct cpumask *cpumask, +static bool queue_stop_cpus_work(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg, struct cpu_stop_done *done) { struct cpu_stop_work *work; unsigned int cpu; + bool queued = false; /* * Disable preemption while queueing to avoid getting @@ -336,9 +337,12 @@ static void queue_stop_cpus_work(const struct cpumask *cpumask, work->fn = fn; work->arg = arg; work->done = done; - cpu_stop_queue_work(cpu, work); + if (cpu_stop_queue_work(cpu, work)) + queued = true; } lg_global_unlock(&stop_cpus_lock); + + return queued; } static int __stop_cpus(const struct cpumask *cpumask, @@ -347,9 +351,11 @@ static int __stop_cpus(const struct cpumask *cpumask, struct cpu_stop_done done; cpu_stop_init_done(&done, cpumask_weight(cpumask)); - queue_stop_cpus_work(cpumask, fn, arg, &done); + if (!queue_stop_cpus_work(cpumask, fn, arg, &done)) + return -ENOENT; wait_for_completion(&done.completion); - return done.executed ? done.ret : -ENOENT; + WARN_ON(!done.executed); + return done.ret; } /**