Skip to content

Commit 075663d

Browse files
Srivatsa S. Bhattorvalds
authored andcommitted
CPU hotplug, debug: detect imbalance between get_online_cpus() and put_online_cpus()
The synchronization between CPU hotplug readers and writers is achieved by means of refcounting, safeguarded by the cpu_hotplug.lock. get_online_cpus() increments the refcount, whereas put_online_cpus() decrements it. If we ever hit an imbalance between the two, we end up compromising the guarantees of the hotplug synchronization i.e, for example, an extra call to put_online_cpus() can end up allowing a hotplug reader to execute concurrently with a hotplug writer. So, add a WARN_ON() in put_online_cpus() to detect such cases where the refcount can go negative, and also attempt to fix it up, so that we can continue to run. Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 7ac57a8 commit 075663d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/cpu.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ void put_online_cpus(void)
8080
if (cpu_hotplug.active_writer == current)
8181
return;
8282
mutex_lock(&cpu_hotplug.lock);
83+
84+
if (WARN_ON(!cpu_hotplug.refcount))
85+
cpu_hotplug.refcount++; /* try to fix things up */
86+
8387
if (!--cpu_hotplug.refcount && unlikely(cpu_hotplug.active_writer))
8488
wake_up_process(cpu_hotplug.active_writer);
8589
mutex_unlock(&cpu_hotplug.lock);

0 commit comments

Comments
 (0)