sched/core: Avoid double update_rq_clock() in move_queued_task()
Address this case: WARNING: CPU: 0 PID: 2070 at ../kernel/sched/core.c:109 update_rq_clock+0x74/0x80 rq->clock_update_flags & RQCF_UPDATED Call Trace: update_rq_clock() move_queued_task() __set_cpus_allowed_ptr() ... 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> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Родитель
5704ac0ae7
Коммит
15ff991e80
|
@ -948,7 +948,7 @@ static struct rq *move_queued_task(struct rq *rq, struct rq_flags *rf,
|
||||||
lockdep_assert_held(&rq->lock);
|
lockdep_assert_held(&rq->lock);
|
||||||
|
|
||||||
p->on_rq = TASK_ON_RQ_MIGRATING;
|
p->on_rq = TASK_ON_RQ_MIGRATING;
|
||||||
dequeue_task(rq, p, 0);
|
dequeue_task(rq, p, DEQUEUE_NOCLOCK);
|
||||||
set_task_cpu(p, new_cpu);
|
set_task_cpu(p, new_cpu);
|
||||||
rq_unlock(rq, rf);
|
rq_unlock(rq, rf);
|
||||||
|
|
||||||
|
@ -987,6 +987,7 @@ static struct rq *__migrate_task(struct rq *rq, struct rq_flags *rf,
|
||||||
if (!cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
|
if (!cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
|
||||||
return rq;
|
return rq;
|
||||||
|
|
||||||
|
update_rq_clock(rq);
|
||||||
rq = move_queued_task(rq, rf, p, dest_cpu);
|
rq = move_queued_task(rq, rf, p, dest_cpu);
|
||||||
|
|
||||||
return rq;
|
return rq;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче