lkml.org 
[lkml]   [2011]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] x86, mm: clean up setup_node_bootmem
    On Wed, 2 Mar 2011, Yinghai Lu wrote:

    >
    > only one user now, so change it to static
    >
    > Also move validity checking into the fuction.
    >
    > Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    >
    > ---
    > arch/x86/include/asm/numa_64.h | 2 --
    > arch/x86/mm/numa_64.c | 10 +++-------
    > 2 files changed, 3 insertions(+), 9 deletions(-)
    >
    > Index: linux-2.6/arch/x86/include/asm/numa_64.h
    > ===================================================================
    > --- linux-2.6.orig/arch/x86/include/asm/numa_64.h
    > +++ linux-2.6/arch/x86/include/asm/numa_64.h
    > @@ -13,8 +13,6 @@ struct bootnode {
    > extern int numa_off;
    >
    > extern unsigned long numa_free_all_bootmem(void);
    > -extern void setup_node_bootmem(int nodeid, unsigned long start,
    > - unsigned long end);
    >
    > #ifdef CONFIG_NUMA
    > /*
    > Index: linux-2.6/arch/x86/mm/numa_64.c
    > ===================================================================
    > --- linux-2.6.orig/arch/x86/mm/numa_64.c
    > +++ linux-2.6/arch/x86/mm/numa_64.c
    > @@ -237,21 +237,18 @@ int __init numa_add_memblk(int nid, u64
    > }
    >
    > /* Initialize bootmem allocator for a node */
    > -void __init
    > +static void __init
    > setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
    > {
    > unsigned long start_pfn, last_pfn, nodedata_phys;
    > const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
    > int nid;
    >
    > - if (!end)
    > - return;
    > -
    > /*
    > * Don't confuse VM with a node that doesn't have the
    > * minimum amount of memory:
    > */
    > - if (end && (end - start) < NODE_MIN_SIZE)
    > + if (end < (start + NODE_MIN_SIZE))
    > return;
    >
    > start = roundup(start, ZONE_ALIGN);
    > @@ -557,8 +554,7 @@ static int __init numa_register_memblks(
    > end = max(mi->blk[i].end, end);
    > }
    >
    > - if (start < end)
    > - setup_node_bootmem(nid, start, end);
    > + setup_node_bootmem(nid, start, end);
    > }
    >
    > return 0;
    >

    Good catch on finding only the one caller of setup_node_bootmem().

    I'd actually rather see the validity checking being done in
    numa_register_memblks(), though, because it's a bug for a node to be set
    in node_possible_map without having a valid
    [mi->blk[i].start, mi->blk[i].end) range.

    So could this be

    BUG_ON(end < start);
    /*
    * Don't confuse the VM with a node that doesn't have the minimum
    * amount of memory.
    */
    if (end < start + NODE_MIN_SIZE) {
    node_clear(nid, node_possible_map);
    continue;
    }
    setup_node_bootmem(nid, start, end);

    instead?


    \
     
     \ /
      Last update: 2011-03-03 21:53    [W:0.031 / U:33.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site