Re: [PATCH] sched/dl: Fix race between dl_task_timer() and sched_setaffinity()

[Kirill Tkhai]

20.05.2014, 09:08, "Kirill Tkhai" <tkhai@xxxxxxxxx>:
> 20.05.2014, 04:00, "Peter Zijlstra" <peterz@xxxxxxxxxxxxx>:
>
>>  On Mon, May 19, 2014 at 11:31:19PM +0400, Kirill Tkhai wrote:
>>>   @@ -513,9 +513,17 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer)
>>>                                                         struct sched_dl_entity,
>>>                                                         dl_timer);
>>>            struct task_struct *p = dl_task_of(dl_se);
>>>   - struct rq *rq = task_rq(p);
>>>   + struct rq *rq;
>>>   +again:
>>>   + rq = task_rq(p);
>>>            raw_spin_lock(&rq->lock);
>>>
>>>   + if (unlikely(rq != task_rq(p))) {
>>>   + /* Task was moved, retrying. */
>>>   + raw_spin_unlock(&rq->lock);
>>>   + goto again;
>>>   + }
>>>   +
>>  That thing is called: rq = __task_rq_lock(p);
>
> But p->pi_lock is not held. The problem is __task_rq_lock() has lockdep assert.
> Should we change it?

Or make something like this?

static inline struct rq *_task_rq_lock(struct task_struct *p)
{
        lockdep_assert_held(&p->pi_lock);

        return __task_rq_lock(p);
}

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/