From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753897AbbKWQXH (ORCPT ); Mon, 23 Nov 2015 11:23:07 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44451 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753137AbbKWQXF (ORCPT ); Mon, 23 Nov 2015 11:23:05 -0500 Date: Mon, 23 Nov 2015 08:22:29 -0800 From: tip-bot for Oleg Nesterov Message-ID: Cc: oleg@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, tj@kernel.org, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, efault@gmx.de, milos@redhat.com, prarit@redhat.com, torvalds@linux-foundation.org Reply-To: tj@kernel.org, efault@gmx.de, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, oleg@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, prarit@redhat.com, milos@redhat.com In-Reply-To: <20151115193320.GA8259@redhat.com> References: <20151115193320.GA8259@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] stop_machine: Change stop_one_cpu() to rely on cpu_stop_queue_work() Git-Commit-ID: 958c5f848e17e216df138cc2161b07b7120e2d15 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: 958c5f848e17e216df138cc2161b07b7120e2d15 Gitweb: http://git.kernel.org/tip/958c5f848e17e216df138cc2161b07b7120e2d15 Author: Oleg Nesterov AuthorDate: Sun, 15 Nov 2015 20:33:20 +0100 Committer: Ingo Molnar CommitDate: Mon, 23 Nov 2015 09:48:18 +0100 stop_machine: Change stop_one_cpu() to rely on cpu_stop_queue_work() Change stop_one_cpu() to return -ENOENT if cpu_stop_queue_work() fails. Otherwise we know that ->executed must be true after wait_for_completion() so we can just return done.ret. 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/20151115193320.GA8259@redhat.com Signed-off-by: Ingo Molnar --- kernel/stop_machine.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 0ec1f16..68b73c4 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -128,9 +128,11 @@ int stop_one_cpu(unsigned int cpu, cpu_stop_fn_t fn, void *arg) struct cpu_stop_work work = { .fn = fn, .arg = arg, .done = &done }; cpu_stop_init_done(&done, 1); - cpu_stop_queue_work(cpu, &work); + if (!cpu_stop_queue_work(cpu, &work)) + return -ENOENT; wait_for_completion(&done.completion); - return done.executed ? done.ret : -ENOENT; + WARN_ON(!done.executed); + return done.ret; } /* This controls the threads on each CPU. */