Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ced66c9 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

hugetlb: abstract numa round robin selection 



Need this as a separate function for a future patch.

No behaviour change.

Acked-by: default avatarAdam Litke <agl@us.ibm.com>
Acked-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3437870

mm/hugetlb.c

+22 −15
Original line number Diff line number Diff line
@@ -565,19 +565,6 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid) 
	return page;

}



static int alloc_fresh_huge_page(struct hstate *h)

{

	struct page *page;

	int start_nid;

	int next_nid;

	int ret = 0;



	start_nid = h->hugetlb_next_nid;



	do {

		page = alloc_fresh_huge_page_node(h, h->hugetlb_next_nid);

		if (page)

			ret = 1;

/*

 * Use a helper variable to find the next node and then

 * copy it back to hugetlb_next_nid afterwards:
@@ -589,10 +576,30 @@ static int alloc_fresh_huge_page(struct hstate *h) 
 * if we just successfully allocated a hugepage so that

 * the next caller gets hugepages on the next node.

 */

static int hstate_next_node(struct hstate *h)

{

	int next_nid;

	next_nid = next_node(h->hugetlb_next_nid, node_online_map);

	if (next_nid == MAX_NUMNODES)

		next_nid = first_node(node_online_map);

	h->hugetlb_next_nid = next_nid;

	return next_nid;

}



static int alloc_fresh_huge_page(struct hstate *h)

{

	struct page *page;

	int start_nid;

	int next_nid;

	int ret = 0;



	start_nid = h->hugetlb_next_nid;



	do {

		page = alloc_fresh_huge_page_node(h, h->hugetlb_next_nid);

		if (page)

			ret = 1;

		next_nid = hstate_next_node(h);

	} while (!page && h->hugetlb_next_nid != start_nid);



	if (ret)