* [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq
@ 2017-05-08 19:22 Daniel Axtens
2017-05-08 19:32 ` Konstantin Khlebnikov
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Axtens @ 2017-05-08 19:22 UTC (permalink / raw)
To: linux-kernel, peterz, mingo, Konstantin Khlebnikov
Cc: Daniel Axtens, Ben Segall, Thomas Gleixner
If we set a next or last buddy for a se that is not on_rq, we will
end up taking a NULL pointer dereference in wakeup_preempt_entity
via pick_next_task_fair.
Detect when we would be about to do that, throw a warning and
then refuse to actually set it.
This has been suggested at least twice[0][1]: just do it.
[0] https://marc.info/?l=linux-kernel&m=146651668921468&w=2
[1] https://lkml.org/lkml/2016/6/16/663
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Ben Segall <bsegall@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
I recently had to debug a problem with these (we hadn't backported
Konstantin's patches in this area) and this would have saved a lot
of time/pain.
---
kernel/sched/fair.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d71109321841..9b988815b4ad 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6168,8 +6168,11 @@ static void set_last_buddy(struct sched_entity *se)
if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
return;
- for_each_sched_entity(se)
+ for_each_sched_entity(se) {
+ if (WARN_ON_ONCE(!se->on_rq))
+ return;
cfs_rq_of(se)->last = se;
+ }
}
static void set_next_buddy(struct sched_entity *se)
@@ -6177,8 +6180,11 @@ static void set_next_buddy(struct sched_entity *se)
if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
return;
- for_each_sched_entity(se)
+ for_each_sched_entity(se) {
+ if (WARN_ON_ONCE(!se->on_rq))
+ return;
cfs_rq_of(se)->next = se;
+ }
}
static void set_skip_buddy(struct sched_entity *se)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq
2017-05-08 19:22 [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq Daniel Axtens
@ 2017-05-08 19:32 ` Konstantin Khlebnikov
2017-05-09 1:47 ` Daniel Axtens
2017-05-09 6:45 ` Peter Zijlstra
0 siblings, 2 replies; 4+ messages in thread
From: Konstantin Khlebnikov @ 2017-05-08 19:32 UTC (permalink / raw)
To: Daniel Axtens
Cc: Linux Kernel Mailing List, Peter Zijlstra, Ingo Molnar,
Konstantin Khlebnikov, Ben Segall, Thomas Gleixner
On Mon, May 8, 2017 at 10:22 PM, Daniel Axtens <dja@axtens.net> wrote:
> If we set a next or last buddy for a se that is not on_rq, we will
> end up taking a NULL pointer dereference in wakeup_preempt_entity
> via pick_next_task_fair.
>
> Detect when we would be about to do that, throw a warning and
> then refuse to actually set it.
>
> This has been suggested at least twice[0][1]: just do it.
>
> [0] https://marc.info/?l=linux-kernel&m=146651668921468&w=2
> [1] https://lkml.org/lkml/2016/6/16/663
>
> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Cc: Ben Segall <bsegall@google.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Daniel Axtens <dja@axtens.net>
>
> ---
>
> I recently had to debug a problem with these (we hadn't backported
> Konstantin's patches in this area) and this would have saved a lot
> of time/pain.
Yep, this is worth debug. But I think it should be under compile-time
config option.
Something like CONFIG_DEBUG_VM which enables VM_BUG_ON and VM_WARN_ON.
> ---
> kernel/sched/fair.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index d71109321841..9b988815b4ad 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -6168,8 +6168,11 @@ static void set_last_buddy(struct sched_entity *se)
> if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
> return;
>
> - for_each_sched_entity(se)
> + for_each_sched_entity(se) {
> + if (WARN_ON_ONCE(!se->on_rq))
> + return;
> cfs_rq_of(se)->last = se;
> + }
> }
>
> static void set_next_buddy(struct sched_entity *se)
> @@ -6177,8 +6180,11 @@ static void set_next_buddy(struct sched_entity *se)
> if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
> return;
>
> - for_each_sched_entity(se)
> + for_each_sched_entity(se) {
> + if (WARN_ON_ONCE(!se->on_rq))
> + return;
> cfs_rq_of(se)->next = se;
> + }
> }
>
> static void set_skip_buddy(struct sched_entity *se)
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq
2017-05-08 19:32 ` Konstantin Khlebnikov
@ 2017-05-09 1:47 ` Daniel Axtens
2017-05-09 6:45 ` Peter Zijlstra
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Axtens @ 2017-05-09 1:47 UTC (permalink / raw)
To: Konstantin Khlebnikov
Cc: Linux Kernel Mailing List, Peter Zijlstra, Ingo Molnar,
Konstantin Khlebnikov, Ben Segall, Thomas Gleixner
Konstantin Khlebnikov <koct9i@gmail.com> writes:
> On Mon, May 8, 2017 at 10:22 PM, Daniel Axtens <dja@axtens.net> wrote:
>> If we set a next or last buddy for a se that is not on_rq, we will
>> end up taking a NULL pointer dereference in wakeup_preempt_entity
>> via pick_next_task_fair.
>>
>> Detect when we would be about to do that, throw a warning and
>> then refuse to actually set it.
>>
>> This has been suggested at least twice[0][1]: just do it.
>>
>> [0] https://marc.info/?l=linux-kernel&m=146651668921468&w=2
>> [1] https://lkml.org/lkml/2016/6/16/663
>>
>> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
>> Cc: Ben Segall <bsegall@google.com>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Signed-off-by: Daniel Axtens <dja@axtens.net>
>>
>> ---
>>
>> I recently had to debug a problem with these (we hadn't backported
>> Konstantin's patches in this area) and this would have saved a lot
>> of time/pain.
>
> Yep, this is worth debug. But I think it should be under compile-time
> config option.
> Something like CONFIG_DEBUG_VM which enables VM_BUG_ON and VM_WARN_ON.
OK, will respin.
Regards,
Daniel
>
>> ---
>> kernel/sched/fair.c | 10 ++++++++--
>> 1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
>> index d71109321841..9b988815b4ad 100644
>> --- a/kernel/sched/fair.c
>> +++ b/kernel/sched/fair.c
>> @@ -6168,8 +6168,11 @@ static void set_last_buddy(struct sched_entity *se)
>> if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
>> return;
>>
>> - for_each_sched_entity(se)
>> + for_each_sched_entity(se) {
>> + if (WARN_ON_ONCE(!se->on_rq))
>> + return;
>> cfs_rq_of(se)->last = se;
>> + }
>> }
>>
>> static void set_next_buddy(struct sched_entity *se)
>> @@ -6177,8 +6180,11 @@ static void set_next_buddy(struct sched_entity *se)
>> if (entity_is_task(se) && unlikely(task_of(se)->policy == SCHED_IDLE))
>> return;
>>
>> - for_each_sched_entity(se)
>> + for_each_sched_entity(se) {
>> + if (WARN_ON_ONCE(!se->on_rq))
>> + return;
>> cfs_rq_of(se)->next = se;
>> + }
>> }
>>
>> static void set_skip_buddy(struct sched_entity *se)
>> --
>> 2.11.0
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq
2017-05-08 19:32 ` Konstantin Khlebnikov
2017-05-09 1:47 ` Daniel Axtens
@ 2017-05-09 6:45 ` Peter Zijlstra
1 sibling, 0 replies; 4+ messages in thread
From: Peter Zijlstra @ 2017-05-09 6:45 UTC (permalink / raw)
To: Konstantin Khlebnikov
Cc: Daniel Axtens, Linux Kernel Mailing List, Ingo Molnar,
Konstantin Khlebnikov, Ben Segall, Thomas Gleixner
On Mon, May 08, 2017 at 10:32:30PM +0300, Konstantin Khlebnikov wrote:
> On Mon, May 8, 2017 at 10:22 PM, Daniel Axtens <dja@axtens.net> wrote:
> > I recently had to debug a problem with these (we hadn't backported
> > Konstantin's patches in this area) and this would have saved a lot
> > of time/pain.
>
> Yep, this is worth debug. But I think it should be under compile-time
> config option.
> Something like CONFIG_DEBUG_VM which enables VM_BUG_ON and VM_WARN_ON.
See SCHED_WARN_ON() and feel free to introduce SCHED_WARN_ON_ONCE() if
you feel that's needed.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-09 6:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-08 19:22 [PATCH] sched/fair: WARN and refuse to set buddy when !se->on_rq Daniel Axtens
2017-05-08 19:32 ` Konstantin Khlebnikov
2017-05-09 1:47 ` Daniel Axtens
2017-05-09 6:45 ` Peter Zijlstra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.