public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH bisected regression] sched: rebuild sched domains at suspend/resume
@ 2012-03-06 20:45 Konstantin Khlebnikov
  2012-03-06 21:02 ` Peter Zijlstra
  2012-03-07 13:34 ` Srivatsa S. Bhat
  0 siblings, 2 replies; 15+ messages in thread
From: Konstantin Khlebnikov @ 2012-03-06 20:45 UTC (permalink / raw)
  To: Ingo Molnar, Peter Zijlstra, linux-kernel
  Cc: Andrew Morton, Linus Torvalds, Srivatsa S. Bhat

This is fix for suspend/resume regression introduced in commit 8f2f748b0656
("CPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume")
Without this patch suspend always hangs on my thinkpad x220 (2 x CPU * HT).

cpuset_update_active_cpus() not only juggles with bits in cpusets,
it also calls sched-domains rebuilding after all.

This patch restores sched-domain rebuilds, as it was before that commit.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
---
 kernel/sched/core.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 9995eb0..0fb7406 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6732,6 +6732,10 @@ static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
 	case CPU_DOWN_FAILED:
 		cpuset_update_active_cpus();
 		return NOTIFY_OK;
+	case CPU_ONLINE_FROZEN:
+	case CPU_DOWN_FAILED_FROZEN:
+		rebuild_sched_domains();
+		return NOTIFY_OK;
 	default:
 		return NOTIFY_DONE;
 	}
@@ -6744,6 +6748,9 @@ static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,
 	case CPU_DOWN_PREPARE:
 		cpuset_update_active_cpus();
 		return NOTIFY_OK;
+	case CPU_DOWN_PREPARE_FROZEN:
+		rebuild_sched_domains();
+		return NOTIFY_OK;
 	default:
 		return NOTIFY_DONE;
 	}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2012-04-24 17:15 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-06 20:45 [PATCH bisected regression] sched: rebuild sched domains at suspend/resume Konstantin Khlebnikov
2012-03-06 21:02 ` Peter Zijlstra
2012-03-06 21:47   ` Konstantin Khlebnikov
2012-03-07  0:54   ` Linus Torvalds
2012-03-07  1:38     ` Peter Zijlstra
2012-03-07  1:42       ` Linus Torvalds
2012-03-11 19:44         ` Konstantin Khlebnikov
2012-03-12 11:22           ` Thomas Gleixner
2012-03-12 11:56             ` Srivatsa S. Bhat
2012-04-23 13:14           ` Srivatsa S. Bhat
2012-04-24 17:15             ` Peter Zijlstra
2012-03-07 13:34 ` Srivatsa S. Bhat
2012-03-07 14:02   ` Ingo Molnar
2012-03-07 15:40   ` Konstantin Khlebnikov
2012-03-07 15:49     ` Srivatsa S. Bhat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox