p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 3960c8c0c7 ("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>
This commit is contained in:
Juri Lelli 2015-03-31 09:53:36 +01:00 committed by Ingo Molnar
parent 07c54f7a7f
commit 4cd57f9713
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/sched/deadline.c
View File

@ -514,7 +514,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer)
unsigned long flags; unsigned long flags;
struct rq *rq; 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: * We need to take care of several possible races here:
@ -569,7 +569,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer)
push_dl_task(rq); push_dl_task(rq);
#endif #endif
unlock: unlock:
task_rq_unlock(rq, current, &flags); task_rq_unlock(rq, p, &flags);
return HRTIMER_NORESTART; return HRTIMER_NORESTART;
} }