lkml.org 
[lkml]   [2010]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/23] x86, lmb: Add get_free_all_memory_range()
    Date
    get_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by
    free_all_memory_core_early().

    It will use early_node_map aka active ranges subtract lmb.reserved to
    get all free range, and those ranges will convert to slab pages.

    -v4: increase range size

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: Jan Beulich <jbeulich@novell.com>
    ---
    arch/x86/include/asm/lmb.h | 2 +
    arch/x86/mm/lmb.c | 102 +++++++++++++++++++++++++++++++++++++++++++-
    2 files changed, 103 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
    index a6f14c6..3fb32f3 100644
    --- a/arch/x86/include/asm/lmb.h
    +++ b/arch/x86/include/asm/lmb.h
    @@ -8,5 +8,7 @@ void lmb_x86_to_bootmem(u64 start, u64 end);

    void lmb_x86_reserve_range(u64 start, u64 end, char *name);
    void lmb_x86_free_range(u64 start, u64 end);
    +struct range;
    +int get_free_all_memory_range(struct range **rangep, int nodeid);

    #endif
    diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
    index a6c2662..5abcf00 100644
    --- a/arch/x86/mm/lmb.c
    +++ b/arch/x86/mm/lmb.c
    @@ -86,7 +86,107 @@ u64 __init lmb_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
    return LMB_ERROR;
    }

    -#ifndef CONFIG_NO_BOOTMEM
    +static __init struct range *find_range_array(int count)
    +{
    + u64 end, size, mem;
    + struct range *range;
    +
    + size = sizeof(struct range) * count;
    + end = lmb.current_limit;
    +
    + mem = lmb_find_in_range(0, end, size, sizeof(struct range));
    + if (mem == LMB_ERROR)
    + panic("can not find more space for range array");
    +
    + /*
    + * This range is tempoaray, so don't reserve it, it will not be
    + * overlapped because We will not alloccate new buffer before
    + * We discard this one
    + */
    + range = __va(mem);
    + memset(range, 0, size);
    +
    + return range;
    +}
    +
    +#ifdef CONFIG_NO_BOOTMEM
    +static void __init lmb_x86_subtract_reserved(struct range *range, int az)
    +{
    + int count;
    + u64 final_start, final_end;
    + struct lmb_region *r;
    +
    + /* Take out region array itself at first*/
    + if (lmb.reserved.regions != lmb_reserved_init_regions)
    + lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
    +
    + count = lmb.reserved.cnt;
    +
    + pr_info("Subtract (%d early reservations)\n", count);
    +
    + for_each_lmb(reserved, r) {
    + pr_info(" [%010llx - %010llx]\n", (u64)r->base, (u64)r->base + r->size);
    + final_start = PFN_DOWN(r->base);
    + final_end = PFN_UP(r->base + r->size);
    + if (final_start >= final_end)
    + continue;
    + subtract_range(range, az, final_start, final_end);
    + }
    + /* Put region array back ? */
    + if (lmb.reserved.regions != lmb_reserved_init_regions)
    + lmb_reserve(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
    +}
    +
    +struct count_data {
    + int nr;
    +};
    +
    +static int __init count_work_fn(unsigned long start_pfn,
    + unsigned long end_pfn, void *datax)
    +{
    + struct count_data *data = datax;
    +
    + data->nr++;
    +
    + return 0;
    +}
    +
    +static int __init count_early_node_map(int nodeid)
    +{
    + struct count_data data;
    +
    + data.nr = 0;
    + work_with_active_regions(nodeid, count_work_fn, &data);
    +
    + return data.nr;
    +}
    +
    +int __init get_free_all_memory_range(struct range **rangep, int nodeid)
    +{
    + int count;
    + struct range *range;
    + int nr_range;
    +
    + count = (lmb.reserved.cnt + count_early_node_map(nodeid)) * 2;
    +
    + range = find_range_array(count);
    + nr_range = 0;
    +
    + /*
    + * Use early_node_map[] and lmb.reserved.region to get range array
    + * at first
    + */
    + nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
    +#ifdef CONFIG_X86_32
    + subtract_range(range, count, max_low_pfn, -1ULL);
    +#endif
    + lmb_x86_subtract_reserved(range, count);
    + nr_range = clean_sort_range(range, count);
    +
    + *rangep = range;
    + return nr_range;
    +}
    +#else
    void __init lmb_x86_to_bootmem(u64 start, u64 end)
    {
    int count;
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-07-04 09:05    [W:0.026 / U:122.328 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site