lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: NULL pointer dereference in pick_next_task_fair
On Fri, Nov 08, 2019 at 11:02:12AM +0000, Quentin Perret wrote:
> On Thursday 07 Nov 2019 at 20:29:07 (+0100), Peter Zijlstra wrote:
> > I still havne't had food, but this here compiles...
>
> And it seems to work, too :)

Excellent!

> > @@ -3929,13 +3929,17 @@ pick_next_task(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
> > }
> >
> > restart:
> > - /*
> > - * Ensure that we put DL/RT tasks before the pick loop, such that they
> > - * can PULL higher prio tasks when we lower the RQ 'priority'.
> > - */
> > - prev->sched_class->put_prev_task(rq, prev, rf);
> > - if (!rq->nr_running)
> > - newidle_balance(rq, rf);
> > +#ifdef CONFIG_SMP
> > + for (class = prev->sched_class;
> > + class != &idle_sched_class;
> > + class = class->next) {
> > +
> > + if (class->balance(rq, prev, rf))
> > + break;
> > + }
> > +#endif
> > +
> > + put_prev_task(rq, prev);
>
> Right, that looks much cleaner IMO. I'm thinking if we killed the
> special case for CFS above we could do with a single loop to iterate the
> classes, and you could fold ->balance() in ->pick_next_task() ...

No, you can't, because then you're back to having to restart the pick
when something happens when we drop the rq halfway down the pick. Which
is something I really wanted to get rid of.

> That would remove one call site to newidle_balance() too, which I think
> is good. Hackbench probably won't like that, though.

Yeah, that fast path really is important. I've got a few patches pending
there, fixing a few things and that gets me 2% extra on a sched-yield
benchmark.

> > +static int balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
> > +{
> > + if (rq->cfs.nr_running)

FWIW that must test rq->nr_running.

> > + return 1;
> > +
> > + return newidle_balance(rq, rf) != 0;
>
> And you can ignore the RETRY_TASK case here under the assumption that
> we must have tried to pull from RT/DL before ending up here ?

Well, the balance callback can always return 0 and be correct. The point
is mostly to avoid more work.

In this case, since fair is the last class and we've already excluded
idle for balancing, the win is minimal. But since we have the code,
might as well dtrt.

\
 
 \ /
  Last update: 2019-11-08 13:01    [W:0.084 / U:9.752 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site