Commit 419af25f authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner

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. Convert *_online_cpus() to the new interfaces while at it.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: kvm@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: kvm-ppc@vger.kernel.org
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Alexander Graf <agraf@suse.com>
Link: http://lkml.kernel.org/r/20170524081547.809616236@linutronix.de
parent a92551e4
...@@ -3317,7 +3317,7 @@ void kvmppc_alloc_host_rm_ops(void) ...@@ -3317,7 +3317,7 @@ void kvmppc_alloc_host_rm_ops(void)
return; return;
} }
get_online_cpus(); cpus_read_lock();
for (cpu = 0; cpu < nr_cpu_ids; cpu += threads_per_core) { for (cpu = 0; cpu < nr_cpu_ids; cpu += threads_per_core) {
if (!cpu_online(cpu)) if (!cpu_online(cpu))
...@@ -3339,17 +3339,17 @@ void kvmppc_alloc_host_rm_ops(void) ...@@ -3339,17 +3339,17 @@ void kvmppc_alloc_host_rm_ops(void)
l_ops = (unsigned long) ops; l_ops = (unsigned long) ops;
if (cmpxchg64((unsigned long *)&kvmppc_host_rm_ops_hv, 0, l_ops)) { if (cmpxchg64((unsigned long *)&kvmppc_host_rm_ops_hv, 0, l_ops)) {
put_online_cpus(); cpus_read_unlock();
kfree(ops->rm_core); kfree(ops->rm_core);
kfree(ops); kfree(ops);
return; return;
} }
cpuhp_setup_state_nocalls(CPUHP_KVM_PPC_BOOK3S_PREPARE, cpuhp_setup_state_nocalls_cpuslocked(CPUHP_KVM_PPC_BOOK3S_PREPARE,
"ppc/kvm_book3s:prepare", "ppc/kvm_book3s:prepare",
kvmppc_set_host_core, kvmppc_set_host_core,
kvmppc_clear_host_core); kvmppc_clear_host_core);
put_online_cpus(); cpus_read_unlock();
} }
void kvmppc_free_host_rm_ops(void) void kvmppc_free_host_rm_ops(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment