From: Damien Wyart <damien.wyart@gmail.com>
To: Vincent Guittot <vincent.guittot@linaro.org>
Cc: linux-kernel@vger.kernel.org, linaro-dev@lists.linaro.org,
peterz@infradead.org, mingo@kernel.org,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH] sched: fix env->src_cpu for active migration
Date: Wed, 13 Feb 2013 21:02:26 +0100 [thread overview]
Message-ID: <20130213200226.GA14465@brouette> (raw)
In-Reply-To: <20130213184706.GA23803@brouette>
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
> Bingo, that was the problem in my setup: as the patch was applied
> through a script with others, I had missed the error message about the
> conflict (I have also another conflict which can be safely ignored so
> the new one did not catch my eye)... So the patch was only
> half-applied, and the final code is broken.
> How did you solve the conflict (I am not a scheduler expert)? I can
> retry running the patched kernel with your resolution, to check if
> everything is ok.
After looking a bit more, the conflict resolution seemed straighforward,
so I gave it a go. The attached version booted fine, so the initial
problem was purely PEBCAK... Sorry for the noise!
--
Damien
[-- Attachment #2: patch-sched.patch --]
[-- Type: text/x-diff, Size: 635 bytes --]
--- a/kernel/sched/fair.c 2013-02-06 20:49:17.447613049 +0100
+++ b/kernel/sched/fair.c 2013-02-13 20:52:37.409507417 +0100
@@ -5060,6 +5060,10 @@
ld_moved = 0;
lb_iterations = 1;
clock_updated = 0;
+
+ env.src_cpu = busiest->cpu;
+ env.src_rq = busiest;
+
if (busiest->nr_running > 1) {
/*
* Attempt to move tasks. If find_busiest_group has found
@@ -5068,8 +5072,6 @@
* correctly treated as an imbalance.
*/
env.flags |= LBF_ALL_PINNED;
- env.src_cpu = busiest->cpu;
- env.src_rq = busiest;
env.loop_max = min(sysctl_sched_nr_migrate, busiest->nr_running);
update_h_load(env.src_cpu);
next prev parent reply other threads:[~2013-02-13 20:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 13:19 [PATCH] sched: fix env->src_cpu for active migration Vincent Guittot
2013-02-13 6:18 ` Damien Wyart
2013-02-13 7:54 ` Vincent Guittot
2013-02-13 9:21 ` Damien Wyart
2013-02-13 12:08 ` Vincent Guittot
2013-02-13 14:08 ` Damien Wyart
2013-02-13 14:28 ` Vincent Guittot
2013-02-13 17:49 ` Vincent Guittot
2013-02-13 18:47 ` Damien Wyart
2013-02-13 20:02 ` Damien Wyart [this message]
2013-02-14 8:32 ` Vincent Guittot
2013-02-13 20:03 ` Paul Turner
2013-02-14 13:37 ` Vincent Guittot
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=20130213200226.GA14465@brouette \
--to=damien.wyart@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linaro-dev@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=vincent.guittot@linaro.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