Commit 8f2f748b authored Feb 23, 2012 by Srivatsa S. Bhat Committed by Ingo Molnar Feb 27, 2012

CPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume

Currently, during CPU hotplug, the cpuset callbacks modify the cpusets
to reflect the state of the system, and this handling is asymmetric.
That is, upon CPU offline, that CPU is removed from all cpusets. However
when it comes back online, it is put back only to the root cpuset.

This gives rise to a significant problem during suspend/resume. During
suspend, we offline all non-boot cpus and during resume we online them back.
Which means, after a resume, all cpusets (except the root cpuset) will be
restricted to just one single CPU (the boot cpu). But the whole point of
suspend/resume is to restore the system to a state which is as close as
possible to how it was before suspend.

So to fix this, don't touch cpusets during suspend/resume. That is, modify
the cpuset-related CPU hotplug callback to just ignore CPU hotplug when it
is initiated as part of the suspend/resume sequence.

Reported-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/4F460D7B.1020703@linux.vnet.ibm.com

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 8c79a045

kernel/sched/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6728,7 +6728,7 @@ int __init sched_create_sysfs_power_savings_entries(struct device *dev)
		static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
		void *hcpu)
		{
		switch (action & ~CPU_TASKS_FROZEN) {
		switch (action) {
		case CPU_ONLINE:
		case CPU_DOWN_FAILED:
		cpuset_update_active_cpus();
		@@ -6741,7 +6741,7 @@ static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
		static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,
		void *hcpu)
		{
		switch (action & ~CPU_TASKS_FROZEN) {
		switch (action) {
		case CPU_DOWN_PREPARE:
		cpuset_update_active_cpus();
		return NOTIFY_OK;