From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
"Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Subject: [PATCH bisected regression] sched: rebuild sched domains at suspend/resume
Date: Wed, 07 Mar 2012 00:45:29 +0400 [thread overview]
Message-ID: <20120306204357.13169.90791.stgit@zurg> (raw)
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;
}
next reply other threads:[~2012-03-06 20:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 20:45 Konstantin Khlebnikov [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120306204357.13169.90791.stgit@zurg \
--to=khlebnikov@openvz.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome