[PATCH] sched: unthrottle rt_rq in migrate_tasks()

From: Peter Boonstoppel
Date: Fri May 18 2012 - 14:57:58 EST


migrate_tasks() uses _pick_next_task_rt() to get tasks from the
real-time runqueue to be migrated. When rt_rq is throttled
_pick_next_task_rt() won't return anything, in which case
migrate_tasks() can't move all threads over and gets stuck in an
infinite loop.

Instead unthrottle rt_rq before migrating tasks.

Signed-off-by: Peter Boonstoppel <pboonstoppel@xxxxxxxxxx>
---
kernel/sched/core.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 9236a48..b37e0b3 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5159,6 +5159,12 @@ static void migrate_tasks(unsigned int dead_cpu)
/* Ensure any throttled groups are reachable by pick_next_task */
unthrottle_offline_cfs_rqs(rq);

+ /*
+ * Ensure rt_rq is not throttled so its threads can be migrated using
+ * pick_next_task_rt
+ */
+ rq->rt.rt_throttled = 0;
+
for ( ; ; ) {
/*
* There's this thread running, bail when that's the only
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/