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

mm: add vma_alloc_zeroed_movable_folio() 

Replace alloc_zeroed_user_highpage_movable().  The main difference is
returning a folio containing a single page instead of returning the page,
but take the opportunity to rename the function to match other allocation
functions a little better and rewrite the documentation to place more
emphasis on the zeroing rather than the highmem aspect.

Link: https://lkml.kernel.org/r/20230116191813.2145215-2-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c5792d93

arch/alpha/include/asm/page.h

+2 −3
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
extern void clear_page(void *page);

#define clear_user_page(page, vaddr, pg)	clear_page(page)



#define alloc_zeroed_user_highpage_movable(vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE

#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

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



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

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

arch/arm64/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ void copy_user_highpage(struct page *to, struct page *from, 
void copy_highpage(struct page *to, struct page *from);

#define __HAVE_ARCH_COPY_HIGHPAGE



struct page *alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma,

struct folio *vma_alloc_zeroed_movable_folio(struct vm_area_struct *vma,

						unsigned long vaddr);

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE

#define vma_alloc_zeroed_movable_folio vma_alloc_zeroed_movable_folio



void tag_clear_highpage(struct page *to);

#define __HAVE_ARCH_TAG_CLEAR_HIGHPAGE

arch/arm64/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ NOKPROBE_SYMBOL(do_debug_exception); 
/*

 * Used during anonymous page fault handling.

 */

struct page *alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma,

struct folio *vma_alloc_zeroed_movable_folio(struct vm_area_struct *vma,

						unsigned long vaddr)

{

	gfp_t flags = GFP_HIGHUSER_MOVABLE | __GFP_ZERO;
@@ -938,7 +938,7 @@ struct page *alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma, 
	if (vma->vm_flags & VM_MTE)

		flags |= __GFP_ZEROTAGS;



	return alloc_page_vma(flags, vma, vaddr);

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

}



void tag_clear_highpage(struct page *page)

arch/ia64/include/asm/page.h

+6 −8
Original line number Diff line number Diff line
@@ -82,17 +82,15 @@ do { \ 
} while (0)





#define alloc_zeroed_user_highpage_movable(vma, vaddr)			\

#define vma_alloc_zeroed_movable_folio(vma, vaddr)			\

({									\

	struct page *page = alloc_page_vma(				\

		GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vaddr);		\

	if (page)							\

 		flush_dcache_page(page);				\

	page;								\

	struct folio *folio = vma_alloc_folio(				\

		GFP_HIGHUSER_MOVABLE | __GFP_ZERO, 0, vma, vaddr, false); \

	if (folio)							\

		flush_dcache_folio(folio);				\

	folio;								\

})



#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE



#define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)



#include <asm-generic/memory_model.h>

arch/m68k/include/asm/page_no.h

+2 −3
Original line number Diff line number Diff line
@@ -13,9 +13,8 @@ extern unsigned long memory_end; 
#define clear_user_page(page, vaddr, pg)	clear_page(page)

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



#define alloc_zeroed_user_highpage_movable(vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE

#define vma_alloc_zeroed_movable_folio(vma, vaddr) \

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



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

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