From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970205AbdDTLZl (ORCPT ); Thu, 20 Apr 2017 07:25:41 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37763 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967395AbdDTLZh (ORCPT ); Thu, 20 Apr 2017 07:25:37 -0400 Date: Thu, 20 Apr 2017 04:21:55 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: mpe@ellerman.id.au, bigeasy@linutronix.de, peterz@infradead.org, mingo@kernel.org, benh@kernel.crashing.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, hpa@zytor.com, tglx@linutronix.de, agraf@suse.com Reply-To: mingo@kernel.org, peterz@infradead.org, mpe@ellerman.id.au, bigeasy@linutronix.de, rostedt@goodmis.org, hpa@zytor.com, agraf@suse.com, tglx@linutronix.de, benh@kernel.crashing.org, linux-kernel@vger.kernel.org In-Reply-To: <20170418170552.946155801@linutronix.de> References: <20170418170552.946155801@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] KVM/PPC/Book3S HV: Use cpuhp_setup_state_nocalls_cpuslocked() Git-Commit-ID: 2fd231725b835f38e70fbda0842de57e330cd147 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: 2fd231725b835f38e70fbda0842de57e330cd147 Gitweb: http://git.kernel.org/tip/2fd231725b835f38e70fbda0842de57e330cd147 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:49 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:52 +0200 KVM/PPC/Book3S HV: Use cpuhp_setup_state_nocalls_cpuslocked() kvmppc_alloc_host_rm_ops() holds get_online_cpus() while invoking cpuhp_setup_state_nocalls(). cpuhp_setup_state_nocalls() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use cpuhp_setup_state_nocalls_cpuslocked() to avoid the nested call. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: kvm@vger.kernel.org Cc: Peter Zijlstra Cc: Benjamin Herrenschmidt Cc: Steven Rostedt Cc: kvm-ppc@vger.kernel.org Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Cc: Alexander Graf Link: http://lkml.kernel.org/r/20170418170552.946155801@linutronix.de --- arch/powerpc/kvm/book3s_hv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 1ec86d9..df7117c 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -3336,10 +3336,10 @@ void kvmppc_alloc_host_rm_ops(void) return; } - cpuhp_setup_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE, - "ppc/kvm_book3s:prepare", - kvmppc_set_host_core, - kvmppc_clear_host_core); + cpuhp_setup_state_nocalls_cpuslocked(CPUHP_KVM_PPC_BOOK3S_PREPARE, + "ppc/kvm_book3s:prepare", + kvmppc_set_host_core, + kvmppc_clear_host_core); put_online_cpus(); }