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

x86, hpet: 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 hpet 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>
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
9014ad2a a8c17c29

+3 -1
+3 -1
arch/x86/kernel/hpet.c
··· 943 943 if (boot_cpu_has(X86_FEATURE_ARAT)) 944 944 return 0; 945 945 946 + cpu_notifier_register_begin(); 946 947 for_each_online_cpu(cpu) { 947 948 hpet_cpuhp_notify(NULL, CPU_ONLINE, (void *)(long)cpu); 948 949 } 949 950 950 951 /* This notifier should be called after workqueue is ready */ 951 - hotcpu_notifier(hpet_cpuhp_notify, -20); 952 + __hotcpu_notifier(hpet_cpuhp_notify, -20); 953 + cpu_notifier_register_done(); 952 954 953 955 return 0; 954 956 }