• Dave Young's avatar
    i386: vmalloc size fix · e621bd18
    Dave Young authored
    Booting kernel with vmalloc=[any size<=16m] will oops on my pc (i386/1G memory).
    
    BUG_ON in arch/x86/mm/init_32.c triggered:
    BUG_ON((unsigned long)high_memory > VMALLOC_START);
    
    It's due to the vm area hole.
    
    In include/asm-x86/pgtable_32.h:
    #define VMALLOC_OFFSET	(8 * 1024 * 1024)
    #define VMALLOC_START	(((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) \
    			 & ~(VMALLOC_OFFSET - 1))
    
    There's several related point:
    1. MAXMEM :
     (-__PAGE_OFFSET - __VMALLOC_RESERVE).
    The space after VMALLOC_END is included as well, I set it to
    (VMALLOC_END - PAGE_OFFSET - __VMALLOC_RESERVE)
    
    2. VMALLOC_OFFSET is not considered in __VMALLOC_RESERVE
    fixed by adding VMALLOC_OFFSET to it.
    
    3. VMALLOC_START :
     (((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) & ~(VMALLOC_OFFSET - 1))
    So it's not always 8M, bigger than 8M possible.
    I set it to ((unsigned long)high_memory + VMALLOC_OFFSET)
    
    4. the VMALLOC_RESERVE is an unused macro, so remove it here.
    Signed-off-by: default avatarDave Young <hidave.darkstar@gmail.com>
    Cc: akpm@linux-foundation.org
    Cc: hidave.darkstar@gmail.com
    Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    e621bd18
pgtable_32.c 3.64 KB