Commit 576378249c8e0a020aafeaa702c834dff81dd596

Authored by Srivatsa S. Bhat
Committed by Rafael J. Wysocki
1 parent 0be94bad0b

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: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -387,18 +387,18 @@
387 387 {
388 388 unsigned long cpu;
389 389  
390   - get_online_cpus();
  390 + cpu_notifier_register_begin();
391 391 for_each_online_cpu(cpu)
392 392 if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK)
393 393 goto cleanup;
394   - register_cpu_notifier(&zswap_cpu_notifier_block);
395   - put_online_cpus();
  394 + __register_cpu_notifier(&zswap_cpu_notifier_block);
  395 + cpu_notifier_register_done();
396 396 return 0;
397 397  
398 398 cleanup:
399 399 for_each_online_cpu(cpu)
400 400 __zswap_cpu_notifier(CPU_UP_CANCELED, cpu);
401   - put_online_cpus();
  401 + cpu_notifier_register_done();
402 402 return -ENOMEM;
403 403 }
404 404