Commit fd8cb2e7 authored by Luca Abeni's avatar Luca Abeni Committed by Greg Kroah-Hartman

sched/deadline: Fix switching to -deadline

commit 295d6d5e upstream.

Fix a bug introduced in:

  72f9f3fd ("sched/deadline: Remove dl_new from struct sched_dl_entity")

After that commit, when switching to -deadline if the scheduling
deadline of a task is in the past then switched_to_dl() calls
setup_new_entity() to properly initialize the scheduling deadline
and runtime.

The problem is that the task is enqueued _before_ having its parameters
initialized by setup_new_entity(), and this can cause problems.
For example, a task with its out-of-date deadline in the past will
potentially be enqueued as the highest priority one; however, its
adjusted deadline may not be the earliest one.

This patch fixes the problem by initializing the task's parameters before
enqueuing it.
Signed-off-by: default avatarluca abeni <>
Signed-off-by: default avatarPeter Zijlstra (Intel) <>
Reviewed-by: default avatarDaniel Bristot de Oliveira <>
Cc: Juri Lelli <>
Cc: Linus Torvalds <>
Cc: Mathieu Poirier <>
Cc: Mike Galbraith <>
Cc: Peter Zijlstra <>
Cc: Steven Rostedt <>
Cc: Thomas Gleixner <>
Link: default avatarIngo Molnar <>
Signed-off-by: default avatarSudip Mukherjee <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 8d015a36
......@@ -1365,6 +1365,10 @@ enqueue_dl_entity(struct sched_dl_entity *dl_se,
update_dl_entity(dl_se, pi_se);
} else if (flags & ENQUEUE_REPLENISH) {
replenish_dl_entity(dl_se, pi_se);
} else if ((flags & ENQUEUE_RESTORE) &&
rq_clock(rq_of_dl_rq(dl_rq_of_se(dl_se))))) {
......@@ -2256,13 +2260,6 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)
* If p is boosted we already updated its params in
* rt_mutex_setprio()->enqueue_task(..., ENQUEUE_REPLENISH),
* p's deadline being now already after rq_clock(rq).
if (dl_time_before(p->dl.deadline, rq_clock(rq)))
if (rq->curr != p) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment