aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Redpath <chris.redpath@arm.com>2013-05-16 17:48:01 +0100
committerJon Medhurst <tixy@linaro.org>2013-07-17 11:12:26 +0100
commitd2c920023cbc456414f8e07ff253a89be535b41b (patch)
tree4d52a5d5ba1b1b6810ed9e73769b88d951f47a7e
parenta9f9bca843e44144670c660638274363f34b9847 (diff)
sched: Do not ignore grouped tasks during HMP forced migration.
If the entity is not a task, it is a cfs group rq. Iterate up to find the task entity. Change-Id: I7cab7aba0798f6f14e38ad32e566d90e5937ffbc Signed-off-by: Chris Redpath <chris.redpath@arm.com>
-rw-r--r--kernel/sched/fair.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 474dc61b3af..3866dcc9972 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6109,10 +6109,19 @@ static void hmp_force_up_migration(int this_cpu)
target = cpu_rq(cpu);
raw_spin_lock_irqsave(&target->lock, flags);
curr = target->cfs.curr;
- if (!curr || !entity_is_task(curr)) {
+ if (!curr) {
raw_spin_unlock_irqrestore(&target->lock, flags);
continue;
}
+ if (!entity_is_task(curr)) {
+ struct cfs_rq *cfs_rq;
+
+ cfs_rq = group_cfs_rq(curr);
+ while (cfs_rq) {
+ curr = cfs_rq->curr;
+ cfs_rq = group_cfs_rq(curr);
+ }
+ }
p = task_of(curr);
if (hmp_up_migration(cpu, curr)) {
if (!target->active_balance) {