提交 57637824 编写于 作者: S Srivatsa S. Bhat 提交者: Rafael J. Wysocki

mm, zswap: 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 zswap code by using this latter form of callback registration.

Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 0be94bad
...@@ -387,18 +387,18 @@ static int zswap_cpu_init(void) ...@@ -387,18 +387,18 @@ static int zswap_cpu_init(void)
{ {
unsigned long cpu; unsigned long cpu;
get_online_cpus(); cpu_notifier_register_begin();
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK) if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK)
goto cleanup; goto cleanup;
register_cpu_notifier(&zswap_cpu_notifier_block); __register_cpu_notifier(&zswap_cpu_notifier_block);
put_online_cpus(); cpu_notifier_register_done();
return 0; return 0;
cleanup: cleanup:
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
__zswap_cpu_notifier(CPU_UP_CANCELED, cpu); __zswap_cpu_notifier(CPU_UP_CANCELED, cpu);
put_online_cpus(); cpu_notifier_register_done();
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册