lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 25/30] hugetlb: restore interleaving of bootmem huge pages (2.6.31)

    2.6.30-stable review patch. If anyone has any objections, please let us know.

    ------------------
    From: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Not upstream as it is fixed differently in .32

    I noticed that alloc_bootmem_huge_page() will only advance to the next
    node on failure to allocate a huge page. I asked about this on linux-mm
    and linux-numa, cc'ing the usual huge page suspects. Mel Gorman
    responded:

    I strongly suspect that the same node being used until allocation
    failure instead of round-robin is an oversight and not deliberate
    at all. It appears to be a side-effect of a fix made way back in
    commit 63b4613c3f0d4b724ba259dc6c201bb68b884e1a ["hugetlb: fix
    hugepage allocation with memoryless nodes"]. Prior to that patch
    it looked like allocations would always round-robin even when
    allocation was successful.

    Andy Whitcroft countered that the existing behavior looked like Andi
    Kleen's original implementation and suggested that we ask him. We did and
    Andy replied that his intention was to interleave the allocations. So,
    ...

    This patch moves the advance of the hstate next node from which to
    allocate up before the test for success of the attempted allocation. This
    will unconditionally advance the next node from which to alloc,
    interleaving successful allocations over the nodes with sufficient
    contiguous memory, and skipping over nodes that fail the huge page
    allocation attempt.

    Note that alloc_bootmem_huge_page() will only be called for huge pages of
    order > MAX_ORDER.

    Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
    Reviewed-by: Andi Kleen <ak@linux.intel.com>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Adam Litke <agl@us.ibm.com>
    Cc: Andy Whitcroft <apw@canonical.com>
    Cc: Eric Whitney <eric.whitney@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    mm/hugetlb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -1017,6 +1017,7 @@ int __weak alloc_bootmem_huge_page(struc
    NODE_DATA(h->hugetlb_next_nid),
    huge_page_size(h), huge_page_size(h), 0);

    + hstate_next_node(h);
    if (addr) {
    /*
    * Use the beginning of the huge page to store the
    @@ -1026,7 +1027,6 @@ int __weak alloc_bootmem_huge_page(struc
    m = addr;
    goto found;
    }
    - hstate_next_node(h);
    nr_nodes--;
    }
    return 0;



    \
     
     \ /
      Last update: 2009-10-02 01:43    [W:0.048 / U:2.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site