Commit 6359c39c authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: remove unused hugepage for vma_alloc_folio() 

The hugepage parameter was deprecated since commit ddc1a5cb
("mempolicy: alloc_pages_mpol() for NUMA policy without vma"), for
PMD-sized THP, it still tries only preferred node if possible in
vma_alloc_folio() by checking the order of the folio allocation.

Link: https://lkml.kernel.org/r/20241010061556.1846751-1-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarBarry Song <baohua@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f8780515

arch/alpha/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern void clear_page(void *page); 
#define clear_user_page(page, vaddr, pg)	clear_page(page)



#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr, false)

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr)



extern void copy_page(void * _to, void * _from);

#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ struct folio *vma_alloc_zeroed_movable_folio(struct vm_area_struct *vma, 
	if (vma->vm_flags & VM_MTE)

		flags |= __GFP_ZEROTAGS;



	return vma_alloc_folio(flags, 0, vma, vaddr, false);

	return vma_alloc_folio(flags, 0, vma, vaddr);

}



void tag_clear_highpage(struct page *page)

arch/m68k/include/asm/page_no.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ extern unsigned long memory_end; 
#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)



#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr, false)

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr)



#define __pa(vaddr)		((unsigned long)(vaddr))

#define __va(paddr)		((void *)((unsigned long)(paddr)))

arch/s390/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static inline void copy_page(void *to, void *from) 
#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)



#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr, false)

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr)



/*

 * These are used to make use of C type-checking..

arch/x86/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, 
}



#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr, false)

	vma_alloc_folio(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr)



#ifndef __pa

#define __pa(x)		__phys_addr((unsigned long)(x))