Commit 84172f4b authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

mm/page_alloc: combine __alloc_pages and __alloc_pages_nodemask 

There are only two callers of __alloc_pages() so prune the thicket of
alloc_page variants by combining the two functions together.  Current
callers of __alloc_pages() simply add an extra 'NULL' parameter and
current callers of __alloc_pages_nodemask() call __alloc_pages() instead.

Link: https://lkml.kernel.org/r/20210225150642.2582252-4-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e5e0f28

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ compact_fail 
	but failed.



It is possible to establish how long the stalls were using the function

tracer to record how long was spent in __alloc_pages_nodemask and

tracer to record how long was spent in __alloc_pages() and

using the mm_page_alloc tracepoint to identify which allocations were

for huge pages.

include/linux/gfp.h

+3 −10
Original line number Diff line number Diff line
@@ -515,16 +515,9 @@ static inline int arch_make_page_accessible(struct page *page) 
}

#endif



struct page *

__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,

struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,

		nodemask_t *nodemask);



static inline struct page *

__alloc_pages(gfp_t gfp_mask, unsigned int order, int preferred_nid)

{

	return __alloc_pages_nodemask(gfp_mask, order, preferred_nid, NULL);

}



/*

 * Allocate pages, preferring the node given as nid. The node must be valid and

 * online. For more general interface, see alloc_pages_node().
@@ -535,7 +528,7 @@ __alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) 
	VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES);

	VM_WARN_ON((gfp_mask & __GFP_THISNODE) && !node_online(nid));



	return __alloc_pages(gfp_mask, order, nid);

	return __alloc_pages(gfp_mask, order, nid, NULL);

}



/*

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ static struct page *alloc_buddy_huge_page(struct hstate *h, 
		gfp_mask |= __GFP_RETRY_MAYFAIL;

	if (nid == NUMA_NO_NODE)

		nid = numa_mem_id();

	page = __alloc_pages_nodemask(gfp_mask, order, nid, nmask);

	page = __alloc_pages(gfp_mask, order, nid, nmask);

	if (page)

		__count_vm_event(HTLB_BUDDY_PGALLOC);

	else

mm/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -145,10 +145,10 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); 
 * family of functions.

 *

 * nodemask, migratetype and highest_zoneidx are initialized only once in

 * __alloc_pages_nodemask() and then never change.

 * __alloc_pages() and then never change.

 *

 * zonelist, preferred_zone and highest_zoneidx are set first in

 * __alloc_pages_nodemask() for the fast path, and might be later changed

 * __alloc_pages() for the fast path, and might be later changed

 * in __alloc_pages_slowpath(). All other functions pass the whole structure

 * by a const pointer.

 */

mm/mempolicy.c

+3 −3
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, 
{

	struct page *page;



	page = __alloc_pages(gfp, order, nid);

	page = __alloc_pages(gfp, order, nid, NULL);

	/* skip NUMA_INTERLEAVE_HIT counter update if numa stats is disabled */

	if (!static_branch_likely(&vm_numa_stat_key))

		return page;
@@ -2237,7 +2237,7 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma, 


	nmask = policy_nodemask(gfp, pol);

	preferred_nid = policy_node(gfp, pol, node);

	page = __alloc_pages_nodemask(gfp, order, preferred_nid, nmask);

	page = __alloc_pages(gfp, order, preferred_nid, nmask);

	mpol_cond_put(pol);

out:

	return page;
@@ -2274,7 +2274,7 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order) 
	if (pol->mode == MPOL_INTERLEAVE)

		page = alloc_page_interleave(gfp, order, interleave_nodes(pol));

	else

		page = __alloc_pages_nodemask(gfp, order,

		page = __alloc_pages(gfp, order,

				policy_node(gfp, pol, numa_node_id()),

				policy_nodemask(gfp, pol));