Commit 92638b4e authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Will Deacon
Browse files

mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 



In an upcoming change we would like to add a flag to
GFP_HIGHUSER_MOVABLE so that it would no longer be an OR
of GFP_HIGHUSER and __GFP_MOVABLE. This poses a problem for
alloc_zeroed_user_highpage_movable() which passes __GFP_MOVABLE
into an arch-specific __alloc_zeroed_user_highpage() hook which ORs
in GFP_HIGHUSER.

Since __alloc_zeroed_user_highpage() is only ever called from
alloc_zeroed_user_highpage_movable(), we can remove one level
of indirection here. Remove __alloc_zeroed_user_highpage(),
make alloc_zeroed_user_highpage_movable() the hook, and use
GFP_HIGHUSER_MOVABLE in the hook implementations so that they will
pick up the new flag that we are going to add.

Signed-off-by: default avatarPeter Collingbourne <pcc@google.com>
Link: https://linux-review.googlesource.com/id/Ic6361c657b2cdcd896adbe0cf7cb5a7fbb1ed7bf


Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210602235230.3928842-2-pcc@google.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3d0cca0b

arch/alpha/include/asm/page.h

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

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



#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vmaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#define alloc_zeroed_user_highpage_movable(vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vmaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE



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

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,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



#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#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 clear_user_page(page, vaddr, pg)	clear_page(page)

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

arch/ia64/include/asm/page.h

+3 −3
Original line number Diff line number Diff line
@@ -82,16 +82,16 @@ do { \ 
} while (0)





#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr)		\

#define alloc_zeroed_user_highpage_movable(vma, vaddr)			\

({									\

	struct page *page = alloc_page_vma(				\

		GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr);	\

		GFP_HIGHUSER_MOVABLE | __GFP_ZERO, vma, vaddr);		\

	if (page)							\

 		flush_dcache_page(page);				\

	page;								\

})



#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE_MOVABLE



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

arch/m68k/include/asm/page_no.h

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 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(movableflags, vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#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 __pa(vaddr)		((unsigned long)(vaddr))

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

arch/s390/include/asm/page.h

+3 −3
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ static inline void copy_page(void *to, void *from) 
#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(movableflags, vma, vaddr) \

	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE

#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



/*

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