lkml.org 
[lkml]   [2015]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2] sched/deadline: fix earliest_dl.next is not the pushable candidate
From
Hi Juri,
2015-11-19 17:38 GMT+08:00 Juri Lelli <juri.lelli@arm.com>:
> Hi,
>
> On 10/11/15 20:33, Wanpeng Li wrote:
>> earliest_dl.next is used to cache the next earliest ready task
>> which also is pushable in order to be a candidate of pushable
>> tasks during pull algorithm. If the earliest_dl.next deadline
>> of the sr_rq is earlier than the earliest_dl.curr deadline of
>> current rq, the task from the sr_rq can be pulled. However,
>> current implementation logic of earliest_dl.next just guarantee
>> it is the next earliest ready task instead of the next pushable
>> earliest task, which will result in hold both rqs' lock and find
>> nothing to preempt our current since the affinity in pull algorithm.
>> In addition, current logic doesn't update the next candidate for
>> pushing in pick_next_task_dl() even if the running task is never
>> eligible.
>>
>> This patch fix it by updating earliest_dl.next when pushable dl
>> task is enqueued/dequeued the same way as rt class.
>>
>
> I'd slightly modify subject and changelog as something like:

Thanks for your help. :-)

>
> sched/deadline: fix earliest_dl.next logic
>
> earliest_dl.next should cache deadline of the earliest ready task that
> is also enqueued in the pushable rbtree, as pull algorithm uses this
> information to find candidates for migration: if the earliest_dl.next
> deadline of source rq is earlier than the earliest_dl.curr deadline of
> destination rq, the task from the source rq can be pulled.
>
> However, current implementation only guarantees that earliest_dl.next is
> the deadline of the next ready task instead of the next pushable task;
> which will result in potentially holding both rqs' lock and find nothing
> to migrate because of affinity constraints. In addition, current logic
> doesn't update the next candidate for pushing in pick_next_task_dl(),
> even if the running task is never eligible.
>
> This patch fixes both problems by updating earliest_dl.next when
> pushable dl task is enqueued/dequeued, similar to what we already do for
> RT.
>
>> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
>> ---
>> v1 -> v2:
>> * fix potential NULL pointer dereference
>>
>> kernel/sched/deadline.c | 61 ++++++++-----------------------------------------
>> 1 file changed, 10 insertions(+), 51 deletions(-)
>>
>> diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
>> index 142df26..b18c116 100644
>> --- a/kernel/sched/deadline.c
>> +++ b/kernel/sched/deadline.c
>> @@ -87,6 +87,8 @@ void init_dl_rq(struct dl_rq *dl_rq)
>>
>> #ifdef CONFIG_SMP
>>
>> +static struct task_struct *pick_next_pushable_dl_task(struct rq *rq);
>> +
>> static inline int dl_overloaded(struct rq *rq)
>> {
>> return atomic_read(&rq->rd->dlo_count);
>> @@ -181,11 +183,15 @@ static void enqueue_pushable_dl_task(struct rq *rq, struct task_struct *p)
>>
>> rb_link_node(&p->pushable_dl_tasks, parent, link);
>> rb_insert_color(&p->pushable_dl_tasks, &dl_rq->pushable_dl_tasks_root);
>> +
>> + if (dl_time_before(p->dl.deadline, dl_rq->earliest_dl.next))
>> + dl_rq->earliest_dl.next = p->dl.deadline;
>> }
>>
>> static void dequeue_pushable_dl_task(struct rq *rq, struct task_struct *p)
>> {
>> struct dl_rq *dl_rq = &rq->dl;
>> + struct task_struct *next_pushable;
>>
>> if (RB_EMPTY_NODE(&p->pushable_dl_tasks))
>> return;
>> @@ -199,6 +205,10 @@ static void dequeue_pushable_dl_task(struct rq *rq, struct task_struct *p)
>>
>> rb_erase(&p->pushable_dl_tasks, &dl_rq->pushable_dl_tasks_root);
>> RB_CLEAR_NODE(&p->pushable_dl_tasks);
>> +
>> + next_pushable = pick_next_pushable_dl_task(rq);
>> + if (next_pushable)
>> + dl_rq->earliest_dl.next = next_pushable->dl.deadline;
>
> We should reset this to 0 if !next_pushable.

I will fix it soon. :-)

Regards,
Wanpeng Li


\
 
 \ /
  Last update: 2015-11-19 11:21    [W:0.050 / U:0.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site