Commit 38558b24 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

mm: make alloc_pages_mpol() static 

All callers outside mempolicy.c now use folio_alloc_mpol() thanks to
Kefeng's cleanups, so we can remove this as a visible symbol.

And also remove the alloc_hooks for alloc_pages_mpol(), since all users
in mempolicy.c are using the nonprof version.

Link: https://lkml.kernel.org/r/20241125210149.2976098-3-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: William Kucharski <william.kucharski@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d4056386

include/linux/gfp.h

+0 −8
Original line number Diff line number Diff line
@@ -300,8 +300,6 @@ static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, 


#ifdef CONFIG_NUMA

struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order);

struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order,

		struct mempolicy *mpol, pgoff_t ilx, int nid);

struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order);

struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order,

		struct mempolicy *mpol, pgoff_t ilx, int nid);
@@ -312,11 +310,6 @@ static inline struct page *alloc_pages_noprof(gfp_t gfp_mask, unsigned int order 
{

	return alloc_pages_node_noprof(numa_node_id(), gfp_mask, order);

}

static inline struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order,

		struct mempolicy *mpol, pgoff_t ilx, int nid)

{

	return alloc_pages_noprof(gfp, order);

}

static inline struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order)

{

	return __folio_alloc_node_noprof(gfp, order, numa_node_id());
@@ -331,7 +324,6 @@ static inline struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int orde 
#endif



#define alloc_pages(...)			alloc_hooks(alloc_pages_noprof(__VA_ARGS__))

#define alloc_pages_mpol(...)			alloc_hooks(alloc_pages_mpol_noprof(__VA_ARGS__))

#define folio_alloc(...)			alloc_hooks(folio_alloc_noprof(__VA_ARGS__))

#define folio_alloc_mpol(...)			alloc_hooks(folio_alloc_mpol_noprof(__VA_ARGS__))

#define vma_alloc_folio(...)			alloc_hooks(vma_alloc_folio_noprof(__VA_ARGS__))

mm/mempolicy.c

+4 −4
Original line number Diff line number Diff line
@@ -2222,7 +2222,7 @@ static struct page *alloc_pages_preferred_many(gfp_t gfp, unsigned int order, 
 *

 * Return: The page on success or NULL if allocation fails.

 */

struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order,

static struct page *alloc_pages_mpol(gfp_t gfp, unsigned int order,

		struct mempolicy *pol, pgoff_t ilx, int nid)

{

	nodemask_t *nodemask;
@@ -2285,7 +2285,7 @@ struct page *alloc_pages_mpol_noprof(gfp_t gfp, unsigned int order, 
struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order,

		struct mempolicy *pol, pgoff_t ilx, int nid)

{

	return page_rmappable_folio(alloc_pages_mpol_noprof(gfp | __GFP_COMP,

	return page_rmappable_folio(alloc_pages_mpol(gfp | __GFP_COMP,

							order, pol, ilx, nid));

}
@@ -2300,7 +2300,7 @@ struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, 
 * NUMA policy.  The caller must hold the mmap_lock of the mm_struct of the

 * VMA to prevent it from going away.  Should be used for all allocations

 * for folios that will be mapped into user space, excepting hugetlbfs, and

 * excepting where direct use of alloc_pages_mpol() is more appropriate.

 * excepting where direct use of folio_alloc_mpol() is more appropriate.

 *

 * Return: The folio on success or NULL if allocation fails.

 */
@@ -2346,7 +2346,7 @@ struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order) 
	if (!in_interrupt() && !(gfp & __GFP_THISNODE))

		pol = get_task_policy(current);



	return alloc_pages_mpol_noprof(gfp, order, pol, NO_INTERLEAVE_INDEX,

	return alloc_pages_mpol(gfp, order, pol, NO_INTERLEAVE_INDEX,

				       numa_node_id());

}

EXPORT_SYMBOL(alloc_pages_noprof);