Patch "sched/deadline: Always enqueue on previous rq when dl_task_timer() fires" has been added to the 4.0-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
sched/deadline: Always enqueue on previous rq when dl_task_timer() fires
to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sched-deadline-always-enqueue-on-previous-rq-when-dl_task_timer-fires.patch
and it can be found in the queue-4.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4cd57f97135840f637431c92380c8da3edbe44edMon Sep 17 00:00:00 2001
From: Juri Lelli <[email protected]>
Date: Tue, 31 Mar 2015 09:53:36 +0100
Subject: sched/deadline: Always enqueue on previous rq when dl_task_timer() fires
From: Juri Lelli <[email protected]>
commit 4cd57f97135840f637431c92380c8da3edbe44ed upstream.
dl_task_timer() may fire on a different rq from where a task was removed after throttling. Since the call path is:
dl_task_timer() ->
enqueue_task_dl() ->
enqueue_dl_entity() ->
replenish_dl_entity()and replenish_dl_entity() uses dl_se's rq, we can't use current's rq in dl_task_timer(), but we need to lock the task's previous one.
--- kernel/sched/deadline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/deadline.c +2 -2
@@ -514,7 +514,7 @@ static enum hrtimer_restart dl_task_timeunsigned long flags;struct rq *rq; - rq =task_rq_lock (current, &flags); + rq =task_rq_lock (p, &flags);/* * We need to take care of several possible races here:
@@ -569,7 +569,7 @@ static enum hrtimer_restart dl_task_timepush_dl_task (rq);#endif unlock: -task_rq_unlock (rq, current, &flags); +task_rq_unlock (rq, p, &flags);return HRTIMER_NORESTART ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.0/sched-deadline-always-enqueue-on-previous-rq-when-dl_task_timer-fires.patch