From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944946AbdDTL2j (ORCPT ); Thu, 20 Apr 2017 07:28:39 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58053 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942044AbdDTL2f (ORCPT ); Thu, 20 Apr 2017 07:28:35 -0400 Date: Thu, 20 Apr 2017 04:24:58 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: rostedt@goodmis.org, peterz@infradead.org, benh@kernel.crashing.org, tglx@linutronix.de, mpe@ellerman.id.au, bigeasy@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org Reply-To: tglx@linutronix.de, benh@kernel.crashing.org, mpe@ellerman.id.au, bigeasy@linutronix.de, rostedt@goodmis.org, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20170418170553.447314339@linutronix.de> References: <20170418170553.447314339@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] powerpc/powernv: Use stop_machine_cpuslocked() Git-Commit-ID: 6e9e61778f976b52fbdeb315850ee6eb4695a1e5 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: 6e9e61778f976b52fbdeb315850ee6eb4695a1e5 Gitweb: http://git.kernel.org/tip/6e9e61778f976b52fbdeb315850ee6eb4695a1e5 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:55 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:54 +0200 powerpc/powernv: Use stop_machine_cpuslocked() set_subcores_per_core() holds get_online_cpus() while invoking stop_machine(). stop_machine() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use stop_machine_cpuslocked() to avoid the nested call. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Benjamin Herrenschmidt Cc: Steven Rostedt Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/20170418170553.447314339@linutronix.de --- arch/powerpc/platforms/powernv/subcore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/powernv/subcore.c b/arch/powerpc/platforms/powernv/subcore.c index 0babef1..67cbf45 100644 --- a/arch/powerpc/platforms/powernv/subcore.c +++ b/arch/powerpc/platforms/powernv/subcore.c @@ -356,7 +356,8 @@ static int set_subcores_per_core(int new_mode) /* Ensure state is consistent before we call the other cpus */ mb(); - stop_machine(cpu_update_split_mode, &new_mode, cpu_online_mask); + stop_machine_cpuslocked(cpu_update_split_mode, &new_mode, + cpu_online_mask); put_online_cpus();