aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>2014-03-10 16:39:20 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 08:43:44 -0400
commit4b0b68af37b930403cf9074c0cf504fc2387c2fa (patch)
treeb0970ac5f825cab0751695c5355c78a91d2a48a4
parent3d0dc643f81ed64e2a7f839e8491728addbc51b9 (diff)
arm64, debug-monitors: Fix CPU hotplug callback registration
Subsystems that want to register CPU hotplug callbacks, as well as perform initialization for the CPUs that are already online, often do it as shown below: get_online_cpus(); for_each_online_cpu(cpu) init_cpu(cpu); register_cpu_notifier(&foobar_cpu_notifier); put_online_cpus(); This is wrong, since it is prone to ABBA deadlocks involving the cpu_add_remove_lock and the cpu_hotplug.lock (when running concurrently with CPU hotplug operations). Instead, the correct and race-free way of performing the callback registration is: cpu_notifier_register_begin(); for_each_online_cpu(cpu) init_cpu(cpu); /* Note the use of the double underscored version of the API */ __register_cpu_notifier(&foobar_cpu_notifier); cpu_notifier_register_done(); Fix the debug-monitors code in arm64 by using this latter form of callback registration. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Ingo Molnar <mingo@kernel.org> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/arm64/kernel/debug-monitors.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 636ba8b6240b..c9855313eb27 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -155,12 +155,16 @@ static struct notifier_block os_lock_nb = {
155 155
156static int debug_monitors_init(void) 156static int debug_monitors_init(void)
157{ 157{
158 cpu_notifier_register_begin();
159
158 /* Clear the OS lock. */ 160 /* Clear the OS lock. */
159 smp_call_function(clear_os_lock, NULL, 1); 161 smp_call_function(clear_os_lock, NULL, 1);
160 clear_os_lock(NULL); 162 clear_os_lock(NULL);
161 163
162 /* Register hotplug handler. */ 164 /* Register hotplug handler. */
163 register_cpu_notifier(&os_lock_nb); 165 __register_cpu_notifier(&os_lock_nb);
166
167 cpu_notifier_register_done();
164 return 0; 168 return 0;
165} 169}
166postcore_initcall(debug_monitors_init); 170postcore_initcall(debug_monitors_init);