mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling.patch removed from -mm tree
The quilt patch titled
Subject: mm: use clear_user_(high)page() for arch with special user folio handling
has been removed from the -mm tree. Its filename was
mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm: use clear_user_(high)page() for arch with special user folio handling
Date: Mon, 9 Dec 2024 13:23:26 -0500
Some architectures have special handling after clearing user folios:
architectures, which set cpu_dcache_is_aliasing() to true, require flushing dcache; arc, which sets cpu_icache_is_aliasing() to true, changes folio->flags to make icache coherent to dcache. So __GFP_ZERO using only clear_page() is not enough to zero user folios and clear_user_(high)page() must be used. Otherwise, user data will be corrupted.
Fix it by always clearing user folios with clear_user_(high)page() when cpu_dcache_is_aliasing() is true or cpu_icache_is_aliasing() is true. Rename alloc_zeroed() to user_alloc_needs_zeroing() and invert the logic to clarify its intend.
---
include/linux/highmem.h | 8 +++++++- include/linux/mm.h | 18 ++++++++++++++++++ mm/huge_memory.c | 9 +++++---- mm/internal.h | 6 ------ mm/memory.c | 10 +++++----- 5 files changed, 35 insertions(+), 16 deletions(-)
include/linux/highmem.h renamed from include/linux/highmem.h~mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling +7 -1
@@ -224,7 +224,13 @@ static inlinestruct folio *vma_alloc_zeroed_movable_folio (struct vm_area_struct *vma,unsigned long vaddr) { -return vma_alloc_folio (GFP_HIGHUSER_MOVABLE | __GFP_ZERO,0 , vma, vaddr); +struct folio *folio; + + folio =vma_alloc_folio (GFP_HIGHUSER_MOVABLE ,0 , vma, vaddr); +if (folio &&user_alloc_needs_zeroing ()) +clear_user_highpage (&folio->page, vaddr); + +return folio; }#endif
include/linux/mm.h renamed from include/linux/mm.h~mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling +18 -0
@@ -31,6 +31,7 @@#include <linux/kasan.h> #include <linux/memremap.h> #include <linux/slab.h> +#include <linux/cacheinfo.h> struct mempolicy ;struct anon_vma ;
@@ -4184,6 +4185,23 @@ static inline int do_mseal(unsigned long }#endif +/* +* user_alloc_needs_zeroing checks if a user folio from page allocator needs to +* be zeroed or not. +*/ +static inline bool user_alloc_needs_zeroing (void ) +{ +/* +* for user folios, arch with cache aliasing requires cache flush and +* arc changes folio->flags to make icache coherent with dcache, so +* always return false to make caller use +* clear_user_page()/clear_user_highpage(). +*/ +return cpu_dcache_is_aliasing () ||cpu_icache_is_aliasing () || + !static_branch_maybe (CONFIG_INIT_ON_ALLOC_DEFAULT_ON , + &init_on_alloc); +} +int arch_get_shadow_stack_status (struct task_struct *t,unsigned long __user *status);int arch_set_shadow_stack_status (struct task_struct *t,unsigned long status);int arch_lock_shadow_stack_status (struct task_struct *t,unsigned long status);
mm/huge_memory.c renamed from mm/huge_memory.c~mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling +5 -4
@@ -1176,11 +1176,12 @@ static struct folio *vma_alloc_anon_folifolio_throttle_swaprate (folio, gfp);/* -* When a folio is not zeroed during allocation (__GFP_ZERO not used), -* folio_zero_user() is used to make sure that the page corresponding -* to the faulting address will be hot in the cache after zeroing. +* When a folio is not zeroed during allocation (__GFP_ZERO not used) +* or user folios require special handling, folio_zero_user() is used to +* make sure that the page corresponding to the faulting address will be +* hot in the cache after zeroing. */ -if (!alloc_zeroed ()) +if (user_alloc_needs_zeroing ())folio_zero_user (folio, addr);/* * The memory barrier inside __folio_mark_uptodate makes sure that
mm/internal.h renamed from mm/internal.h~mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling +0 -6
@@ -1285,12 +1285,6 @@ void touch_pud(struct vm_area_struct *vmvoid touch_pmd (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmd,bool write); -static inline bool alloc_zeroed (void ) -{ -return static_branch_maybe (CONFIG_INIT_ON_ALLOC_DEFAULT_ON , - &init_on_alloc); -} -/* * Parses a string with mem suffixes into its order. Useful to parse kernel * parameters.
mm/memory.c renamed from mm/memory.c~mm-use-clear_user_highpage-for-arch-with-special-user-folio-handling +5 -5
@@ -4733,12 +4733,12 @@ static struct folio *alloc_anon_folio(stfolio_throttle_swaprate (folio, gfp);/* * When a folio is not zeroed during allocation -* (__GFP_ZERO not used), folio_zero_user() is used -* to make sure that the page corresponding to the -* faulting address will be hot in the cache after -* zeroing. +* (__GFP_ZERO not used) or user folios require special +* handling, folio_zero_user() is used to make sure +* that the page corresponding to the faulting address +* will be hot in the cache after zeroing. */ -if (!alloc_zeroed ()) +if (user_alloc_needs_zeroing ())folio_zero_user (folio, vmf->address);return folio; }
_
Patches currently in -mm which might be from [email protected] are