Commit be1a13eb authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm: drop node from alloc_pages_vma 

alloc_pages_vma is meant to allocate a page with a vma specific memory
policy.  The initial node parameter is always a local node so it is
pointless to waste a function argument for this.  Drop the parameter.

Link: https://lkml.kernel.org/r/YaSnlv4QpryEpesG@dhcp22.suse.cz


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Ben Widawsky <ben.widawsky@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca831f29

include/linux/gfp.h

+4 −4
Original line number Diff line number Diff line
@@ -598,9 +598,9 @@ struct page *alloc_pages(gfp_t gfp, unsigned int order); 
struct folio *folio_alloc(gfp_t gfp, unsigned order);

extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,

			struct vm_area_struct *vma, unsigned long addr,

			int node, bool hugepage);

			bool hugepage);

#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \

	alloc_pages_vma(gfp_mask, order, vma, addr, numa_node_id(), true)

	alloc_pages_vma(gfp_mask, order, vma, addr, true)

#else

static inline struct page *alloc_pages(gfp_t gfp_mask, unsigned int order)

{
@@ -610,14 +610,14 @@ static inline struct folio *folio_alloc(gfp_t gfp, unsigned int order) 
{

	return __folio_alloc_node(gfp, order, numa_node_id());

}

#define alloc_pages_vma(gfp_mask, order, vma, addr, node, false)\

#define alloc_pages_vma(gfp_mask, order, vma, addr, false)\

	alloc_pages(gfp_mask, order)

#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \

	alloc_pages(gfp_mask, order)

#endif

#define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)

#define alloc_page_vma(gfp_mask, vma, addr)			\

	alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id(), false)

	alloc_pages_vma(gfp_mask, 0, vma, addr, false)



extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);

extern unsigned long get_zeroed_page(gfp_t gfp_mask);

mm/mempolicy.c

+2 −1
Original line number Diff line number Diff line
@@ -2084,9 +2084,10 @@ 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_vma(gfp_t gfp, int order, struct vm_area_struct *vma,

		unsigned long addr, int node, bool hugepage)

		unsigned long addr, bool hugepage)

{

	struct mempolicy *pol;

	int node = numa_node_id();

	struct page *page;

	int preferred_nid;

	nodemask_t *nmask;

mm/shmem.c

+1 −2
Original line number Diff line number Diff line
@@ -1564,8 +1564,7 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, 
		return NULL;



	shmem_pseudo_vma_init(&pvma, info, hindex);

	page = alloc_pages_vma(gfp, HPAGE_PMD_ORDER, &pvma, 0, numa_node_id(),

			       true);

	page = alloc_pages_vma(gfp, HPAGE_PMD_ORDER, &pvma, 0, true);

	shmem_pseudo_vma_destroy(&pvma);

	if (page)

		prep_transhuge_page(page);