Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, pci, amd-bus: 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 amd-bus code in x86 by using this latter form of callback
registration.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Srivatsa S. Bhat and committed by
Rafael J. Wysocki
9f668f66 9014ad2a

+4 -1
+4 -1
arch/x86/pci/amd_bus.c
··· 380 380 if (early_pci_allowed()) 381 381 pci_enable_pci_io_ecs(); 382 382 383 - register_cpu_notifier(&amd_cpu_notifier); 383 + cpu_notifier_register_begin(); 384 384 for_each_online_cpu(cpu) 385 385 amd_cpu_notify(&amd_cpu_notifier, (unsigned long)CPU_ONLINE, 386 386 (void *)(long)cpu); 387 + __register_cpu_notifier(&amd_cpu_notifier); 388 + cpu_notifier_register_done(); 389 + 387 390 pci_probe |= PCI_HAS_IO_ECS; 388 391 389 392 return 0;