]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
sched/deadline: Always enqueue on previous rq when dl_task_timer() fires
authorJuri Lelli <juri.lelli@arm.com>
Tue, 31 Mar 2015 08:53:36 +0000 (09:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 2 Apr 2015 15:42:56 +0000 (17:42 +0200)
commit4cd57f97135840f637431c92380c8da3edbe44ed
tree3978d002c4b4faf47990a6de7a53af7345b86253
parent07c54f7a7ff77bb47bae26e566969e9c4b6fb0c6
sched/deadline: Always enqueue on previous rq when dl_task_timer() fires

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.

Tested-by: Wanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Kirill Tkhai <ktkhai@parallels.com>
Cc: Juri Lelli <juri.lelli@gmail.com>
Fixes: 3960c8c0c789 ("sched: Make dl_task_time() use task_rq_lock()")
Link: http://lkml.kernel.org/r/1427792017-7356-1-git-send-email-juri.lelli@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/deadline.c