lkml.org 
[lkml]   [2009]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[080/119] sched: Fix boot crash by zalloc()ing most of the cpu masks
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Rusty Russell <rusty@rustcorp.com.au>

    commit 49557e620339cb134127b5bfbcfecc06b77d0232 upstream.

    I got a boot crash when forcing cpumasks offstack on 32 bit,
    because find_new_ilb() returned 3 on my UP system (nohz.cpu_mask
    wasn't zeroed).

    AFAICT the others need to be zeroed too: only
    nohz.ilb_grp_nohz_mask is initialized before use.

    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Peter Zijlstra <peterz@infradead.org>
    LKML-Reference: <200911022037.21282.rusty@rustcorp.com.au>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    kernel/sched.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -9383,13 +9383,13 @@ void __init sched_init(void)
    current->sched_class = &fair_sched_class;

    /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
    - alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
    + zalloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
    #ifdef CONFIG_SMP
    #ifdef CONFIG_NO_HZ
    - alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
    + zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
    alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
    #endif
    - alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
    + zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
    #endif /* SMP */

    perf_counter_init();



    \
     
     \ /
      Last update: 2009-12-07 01:25    [W:7.591 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site