lkml.org 
[lkml]   [2009]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] x86: add boundary check for 32bit res before expand e820 resource to alignment -v2

    fix hang with HIGHMEM_64G and 32bit resource.
    according to hpa and Linus, use (resource_size_t)-1 to fend off big ranges.
    analyized by hpa

    Alex found:
    for i386 machine the specjbb2005 still can not run with hugepage

    -v2: it also fix hugepage problem

    Reported-and-tested-by: Mikael Pettersson <mikpe@it.uu.se>
    Reported-and-Tested-by: Alex Shi <alex.shi@intel.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>

    ---
    arch/x86/include/asm/proto.h | 3 ---
    arch/x86/kernel/e820.c | 20 ++++++++++++--------
    include/linux/kernel.h | 5 +++++
    3 files changed, 17 insertions(+), 11 deletions(-)

    Index: linux-2.6/arch/x86/kernel/e820.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/e820.c
    +++ linux-2.6/arch/x86/kernel/e820.c
    @@ -1367,9 +1367,9 @@ void __init e820_reserve_resources(void)
    }

    /* How much should we pad RAM ending depending on where it is? */
    -static unsigned long ram_alignment(resource_size_t pos)
    +static u64 ram_alignment(u64 pos)
    {
    - unsigned long mb = pos >> 20;
    + u64 mb = pos >> 20;

    /* To 64kB in the first megabyte */
    if (!mb)
    @@ -1383,6 +1383,8 @@ static unsigned long ram_alignment(resou
    return 32*1024*1024;
    }

    +#define MAX_RESOURCE_SIZE ((resource_size_t)-1)
    +
    void __init e820_reserve_resources_late(void)
    {
    int i;
    @@ -1400,17 +1402,19 @@ void __init e820_reserve_resources_late(
    * avoid stolen RAM:
    */
    for (i = 0; i < e820.nr_map; i++) {
    - struct e820entry *entry = &e820_saved.map[i];
    - resource_size_t start, end;
    + struct e820entry *entry = &e820.map[i];
    + u64 start, end;

    if (entry->type != E820_RAM)
    continue;
    start = entry->addr + entry->size;
    - end = round_up(start, ram_alignment(start));
    - if (start == end)
    + end = round_up(start, ram_alignment(start)) - 1;
    + if (end > MAX_RESOURCE_SIZE)
    + end = MAX_RESOURCE_SIZE;
    + if (start > end)
    continue;
    - reserve_region_with_split(&iomem_resource, start,
    - end - 1, "RAM buffer");
    + reserve_region_with_split(&iomem_resource, start, end,
    + "RAM buffer");
    }
    }


    \
     
     \ /
      Last update: 2009-07-02 20:15    [W:0.033 / U:1.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site