leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hugetlb: rework hstate_next_node_* functions

Browse Source 
Modify the hstate_next_node* functions to allow them to be called to
obtain the "start_nid".  Then, whereas prior to this patch we
unconditionally called hstate_next_node_to_{alloc|free}(), whether or not
we successfully allocated/freed a huge page on the node, now we only call
these functions on failure to alloc/free to advance to next allowed node.

Factor out the next_node_allowed() function to handle wrap at end of
node_online_map.  In this version, the allowed nodes include all of the
online nodes.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Reviewed-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: David Rientjes <rientjes@google.com>
Reviewed-by: Andi Kleen <andi@firstfloor.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Eric Whitney <eric.whitney@hp.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Lee Schermerhorn 2009-12-14 17:58:15 -08:00 committed by Linus Torvalds
parent 4e7b8a6cef
commit 9a76db0997
1 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
mm/hugetlb.c
View File

@ -621,6 +621,20 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
return page;
}
/*
* common helper function for hstate_next_node_to_{alloc|free}.
* return next node in node_online_map, wrapping at end.
*/
static int next_node_allowed(int nid)
{
nid = next_node(nid, node_online_map);
if (nid == MAX_NUMNODES)
nid = first_node(node_online_map);
VM_BUG_ON(nid >= MAX_NUMNODES);
return nid;
}
/*
* Use a helper variable to find the next node and then
* copy it back to next_nid_to_alloc afterwards:
@ -634,12 +648,12 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
*/
static int hstate_next_node_to_alloc(struct hstate *h)
{
int next_nid;
next_nid = next_node(h->next_nid_to_alloc, node_online_map);
if (next_nid == MAX_NUMNODES)
next_nid = first_node(node_online_map);
int nid, next_nid;
nid = h->next_nid_to_alloc;
next_nid = next_node_allowed(nid);
h->next_nid_to_alloc = next_nid;
return next_nid;
return nid;
}
static int alloc_fresh_huge_page(struct hstate *h)
@ -649,15 +663,17 @@ static int alloc_fresh_huge_page(struct hstate *h)
int next_nid;
int ret = 0;
start_nid = h->next_nid_to_alloc;
start_nid = hstate_next_node_to_alloc(h);
next_nid = start_nid;
do {
page = alloc_fresh_huge_page_node(h, next_nid);
if (page)
if (page) {
ret = 1;
break;
}
next_nid = hstate_next_node_to_alloc(h);
} while (!page && next_nid != start_nid);
} while (next_nid != start_nid);
if (ret)
count_vm_event(HTLB_BUDDY_PGALLOC);
@ -668,17 +684,19 @@ static int alloc_fresh_huge_page(struct hstate *h)
}
/*
* helper for free_pool_huge_page() - find next node
* from which to free a huge page
* helper for free_pool_huge_page() - return the next node
* from which to free a huge page. Advance the next node id
* whether or not we find a free huge page to free so that the
* next attempt to free addresses the next node.
*/
static int hstate_next_node_to_free(struct hstate *h)
{
int next_nid;
next_nid = next_node(h->next_nid_to_free, node_online_map);
if (next_nid == MAX_NUMNODES)
next_nid = first_node(node_online_map);
int nid, next_nid;
nid = h->next_nid_to_free;
next_nid = next_node_allowed(nid);
h->next_nid_to_free = next_nid;
return next_nid;
return nid;
}
/*
@ -693,7 +711,7 @@ static int free_pool_huge_page(struct hstate *h, bool acct_surplus)
int next_nid;
int ret = 0;
start_nid = h->next_nid_to_free;
start_nid = hstate_next_node_to_free(h);
next_nid = start_nid;
do {
@ -715,9 +733,10 @@ static int free_pool_huge_page(struct hstate *h, bool acct_surplus)
}
update_and_free_page(h, page);
ret = 1;
break;
}
next_nid = hstate_next_node_to_free(h);
} while (!ret && next_nid != start_nid);
} while (next_nid != start_nid);
return ret;
}
@ -1028,10 +1047,9 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
void *addr;
addr = __alloc_bootmem_node_nopanic(
NODE_DATA(h->next_nid_to_alloc),
NODE_DATA(hstate_next_node_to_alloc(h)),
huge_page_size(h), huge_page_size(h), 0);
hstate_next_node_to_alloc(h);
if (addr) {
/*
* Use the beginning of the huge page to store the
@ -1167,29 +1185,31 @@ static int adjust_pool_surplus(struct hstate *h, int delta)
VM_BUG_ON(delta != -1 && delta != 1);
if (delta < 0)
start_nid = h->next_nid_to_alloc;
start_nid = hstate_next_node_to_alloc(h);
else
start_nid = h->next_nid_to_free;
start_nid = hstate_next_node_to_free(h);
next_nid = start_nid;
do {
int nid = next_nid;
if (delta < 0) {
next_nid = hstate_next_node_to_alloc(h);
/*
* To shrink on this node, there must be a surplus page
*/
if (!h->surplus_huge_pages_node[nid])
if (!h->surplus_huge_pages_node[nid]) {
next_nid = hstate_next_node_to_alloc(h);
continue;
}
}
if (delta > 0) {
next_nid = hstate_next_node_to_free(h);
/*
* Surplus cannot exceed the total number of pages
*/
if (h->surplus_huge_pages_node[nid] >=
h->nr_huge_pages_node[nid])
h->nr_huge_pages_node[nid]) {
next_nid = hstate_next_node_to_free(h);
continue;
}
}
h->surplus_huge_pages += delta;