summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2016-10-03 16:44:25 +0200
committerIngo Molnar <mingo@kernel.org>2017-01-14 11:29:34 +0100
commit2fb8d36787affe26f3536c3d8ec094995a48037d (patch)
tree5e174774b6f7f7200b38f3955a5e870a3e27c778
parent3bed5e2166a5e433bf62162f3cd3c5174d335934 (diff)
downloadop-kernel-dev-2fb8d36787affe26f3536c3d8ec094995a48037d.zip
op-kernel-dev-2fb8d36787affe26f3536c3d8ec094995a48037d.tar.gz
sched/core: Add missing update_rq_clock() call in set_user_nice()
Address this rq-clock update bug: WARNING: CPU: 30 PID: 195 at ../kernel/sched/sched.h:797 set_next_entity() rq->clock_update_flags < RQCF_ACT_SKIP Call Trace: dump_stack() __warn() warn_slowpath_fmt() set_next_entity() ? _raw_spin_lock() set_curr_task_fair() set_user_nice.part.85() set_user_nice() create_worker() worker_thread() kthread() ret_from_fork() 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>
-rw-r--r--kernel/sched/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b7f7f21..d233892 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3752,6 +3752,8 @@ void set_user_nice(struct task_struct *p, long nice)
* the task might be in the middle of scheduling on another CPU.
*/
rq = task_rq_lock(p, &rf);
+ update_rq_clock(rq);
+
/*
* The RT priorities are set via sched_setscheduler(), but we still
* allow the 'normal' nice value to be set - but as expected
OpenPOWER on IntegriCloud