Skip to content

Commit 6351c82

Browse files
Peter Zijlstrapundiramit
authored andcommitted
UPSTREAM: sched/core: Add missing update_rq_clock() call for task_hot()
Add the update_rq_clock() call at the top of the callstack instead of at the bottom where we find it missing, this to aid later effort to minimize the number of update_rq_lock() calls. WARNING: CPU: 30 PID: 194 at ../kernel/sched/sched.h:797 assert_clock_updated() rq->clock_update_flags < RQCF_ACT_SKIP Call Trace: dump_stack() __warn() warn_slowpath_fmt() assert_clock_updated.isra.63.part.64() can_migrate_task() load_balance() pick_next_task_fair() __schedule() schedule() worker_thread() kthread() Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> (cherry picked from commit 3bed5e2166a5e433bf62162f3cd3c5174d335934) Change-Id: Ief5070dcce486535334dcb739ee16b989ea9df42 Signed-off-by: Brendan Jackman <brendan.jackman@arm.com> Signed-off-by: Chris Redpath <chris.redpath@arm.com>
1 parent d996ec0 commit 6351c82

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

kernel/sched/fair.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8993,6 +8993,7 @@ static int load_balance(int this_cpu, struct rq *this_rq,
89938993

89948994
more_balance:
89958995
raw_spin_lock_irqsave(&busiest->lock, flags);
8996+
update_rq_clock(busiest);
89968997

89978998
/*
89988999
* cur_ld_moved - load moved in current iteration
@@ -9390,6 +9391,7 @@ static int active_load_balance_cpu_stop(void *data)
93909391
};
93919392

93929393
schedstat_inc(sd, alb_count);
9394+
update_rq_clock(busiest_rq);
93939395

93949396
p = detach_one_task(&env);
93959397
if (p) {

0 commit comments

Comments
 (0)