Commit 6664bfc8 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds
Browse files

mm/hugetlb: take the free hpage during the iteration directly 

Function dequeue_huge_page_node_exact() iterates the free list and return
the first valid free hpage.

Instead of break and check the loop variant, we could return in the loop
directly.  This could reduce some redundant check.

[mike.kravetz@oracle.com: points out a logic error]
[richard.weiyang@linux.alibaba.com: v4]
  Link: https://lkml.kernel.org/r/20200901014636.29737-8-richard.weiyang@linux.alibaba.com



Signed-off-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Link: https://lkml.kernel.org/r/20200831022351.20916-8-richard.weiyang@linux.alibaba.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f37511c

mm/hugetlb.c

+9 −13
Original line number Diff line number Diff line
@@ -1040,16 +1040,9 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) 
		if (nocma && is_migrate_cma_page(page))

			continue;



		if (!PageHWPoison(page))

			break;

	}

		if (PageHWPoison(page))

			continue;



	/*

	 * if 'non-isolated free hugepage' not found on the list,

	 * the allocation fails.

	 */

	if (&h->hugepage_freelists[nid] == &page->lru)

		return NULL;

		list_move(&page->lru, &h->hugepage_activelist);

		set_page_refcounted(page);

		h->free_huge_pages--;
@@ -1057,6 +1050,9 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) 
		return page;

	}



	return NULL;

}



static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, int nid,

		nodemask_t *nmask)

{