Messages in this thread Patch in this message | | | Date | Mon, 29 Oct 2012 16:27:34 -0400 | From | Steven Rostedt <> | Subject | [PATCH 23/32] sched: Update rq clock on nohz CPU before migrating tasks |
| |
From: Frederic Weisbecker <fweisbec@gmail.com>
Because the sched_class::put_prev_task() callback of rt and fair classes are referring to the rq clock to update their runtime statistics. A CPU running in tickless mode may carry a stale value. We need to update it there.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Alessio Igor Bogani <abogani@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Avi Kivity <avi@redhat.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: Christoph Lameter <cl@linux.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Geoff Levand <geoff@infradead.org> Cc: Gilad Ben Yossef <gilad@benyossef.com> Cc: Hakan Akkan <hakanakkan@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Kevin Hilman <khilman@ti.com> Cc: Max Krasnyansky <maxk@qualcomm.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Sven-Thorsten Dietrich <thebigcorporation@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- kernel/sched/core.c | 6 ++++++ kernel/sched/sched.h | 6 ++++++ 2 files changed, 12 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 783d5e4..f0fa54d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4851,6 +4851,12 @@ static void migrate_tasks(unsigned int dead_cpu) */ rq->stop = NULL; + /* + * ->put_prev_task() need to have an up-to-date value + * of rq->clock[_task] + */ + update_nohz_rq_clock(rq); + for ( ; ; ) { /* * There's this thread running, bail when that's the only diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c6cd9ec..1956494 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -948,6 +948,12 @@ static inline void dec_nr_running(struct rq *rq) extern void update_rq_clock(struct rq *rq); +static inline void update_nohz_rq_clock(struct rq *rq) +{ + if (cpuset_cpu_adaptive_nohz(cpu_of(rq))) + update_rq_clock(rq); +} + extern void activate_task(struct rq *rq, struct task_struct *p, int flags); extern void deactivate_task(struct rq *rq, struct task_struct *p, int flags); -- 1.7.10.4
| |