Skip to content
Snippets Groups Projects
Commit e12b7111 authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Rafael J. Wysocki
Browse files

drivers/base/topology.c: 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 topology code by using this latter form of callback registration.

Cc: Ingo Molnar <mingo@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0197fbd2
Branches
Tags
No related merge requests found
...@@ -161,16 +161,20 @@ static int topology_cpu_callback(struct notifier_block *nfb, ...@@ -161,16 +161,20 @@ static int topology_cpu_callback(struct notifier_block *nfb,
static int topology_sysfs_init(void) static int topology_sysfs_init(void)
{ {
int cpu; int cpu;
int rc; int rc = 0;
cpu_notifier_register_begin();
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
rc = topology_add_dev(cpu); rc = topology_add_dev(cpu);
if (rc) if (rc)
return rc; goto out;
} }
hotcpu_notifier(topology_cpu_callback, 0); __hotcpu_notifier(topology_cpu_callback, 0);
return 0; out:
cpu_notifier_register_done();
return rc;
} }
device_initcall(topology_sysfs_init); device_initcall(topology_sysfs_init);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment