Skip to content

Commit c17a290

Browse files
ramosian-gliderctmarinas
authored andcommitted
arm64: define __alloc_zeroed_user_highpage
When running the kernel with init_on_alloc=1, calling the default implementation of __alloc_zeroed_user_highpage() from include/linux/highmem.h leads to double-initialization of the allocated page (first by the page allocator, then by clear_user_page(). Calling alloc_page_vma() with __GFP_ZERO, similarly to e.g. x86, seems to be enough to ensure the user page is zeroed only once. Signed-off-by: Alexander Potapenko <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent d22b115 commit c17a290

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/include/asm/page.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ extern void __cpu_copy_user_page(void *to, const void *from,
2121
extern void copy_page(void *to, const void *from);
2222
extern void clear_page(void *to);
2323

24+
#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
25+
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
26+
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
27+
2428
#define clear_user_page(addr,vaddr,pg) __cpu_clear_user_page(addr, vaddr)
2529
#define copy_user_page(to,from,vaddr,pg) __cpu_copy_user_page(to, from, vaddr)
2630

0 commit comments

Comments
 (0)