mm-vma-move-stack-expansion-logic-to-mm-vmac.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: move stack expansion logic to mm/vma.c
has been removed from the -mm tree. Its filename was
mm-vma-move-stack-expansion-logic-to-mm-vmac.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm/vma: move stack expansion logic to mm/vma.c
Date: Tue, 3 Dec 2024 18:05:11 +0000
We build on previous work making expand_downwards() an entirely internal function.
This logic is subtle and so it is highly useful to get it into vma.c so we can then userland unit test.
We must additionally move acct_stack_growth() to vma.c as it is a helper function used by both expand_downwards() and expand_upwards().
We are also then able to mark anon_vma_interval_tree_pre_update_vma() and anon_vma_interval_tree_post_update_vma() static as these are no longer used by anything else.
---
mm/mmap.c | 205 ---------------------- mm/vma.c | 269 +++++++++++++++++++++++++---- mm/vma.h | 12 - tools/testing/vma/vma.c | 5 tools/testing/vma/vma_internal.h | 62 ++++++ 5 files changed, 310 insertions(+), 243 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-vma-move-stack-expansion-logic-to-mm-vmac +0 -205
@@ -879,211 +879,6 @@ find_vma_prev(struct mm_struct *mm, unsireturn vma; } -/* -* Verify that the stack growth is acceptable and -* update accounting. This is shared with both the -* grow-up and grow-down cases. -*/ -static int acct_stack_growth (struct vm_area_struct *vma, -unsigned long size,unsigned long grow) -{ -struct mm_struct *mm = vma->vm_mm; -unsigned long new_start; - -/* address space limit tests */ -if (!may_expand_vm (mm, vma->vm_flags, grow)) -return -ENOMEM ; - -/* Stack limit test */ -if (size >rlimit (RLIMIT_STACK )) -return -ENOMEM ; - -/* mlock limit tests */ -if (!mlock_future_ok (mm, vma->vm_flags, grow <<PAGE_SHIFT )) -return -ENOMEM ; - -/* Check to ensure the stack will not grow into a hugetlb-only region */ - new_start = (vma->vm_flags &VM_GROWSUP ) ? vma->vm_start : - vma->vm_end - size; -if (is_hugepage_only_range (vma->vm_mm, new_start, size)) -return -EFAULT ; - -/* -* Overcommit.. This must be the final test, as it will -* update security statistics. -*/ -if (security_vm_enough_memory_mm (mm, grow)) -return -ENOMEM ; - -return 0 ; -} - -#if defined(CONFIG_STACK_GROWSUP ) -/* -* PA-RISC uses this for its stack. -* vma is the last one with address > vma->vm_end. Have to extend vma. -*/ -static int expand_upwards (struct vm_area_struct *vma,unsigned long address) -{ -struct mm_struct *mm = vma->vm_mm; -struct vm_area_struct *next; -unsigned long gap_addr; -int error =0 ; -VMA_ITERATOR (vmi, mm, vma->vm_start); - -if (!(vma->vm_flags &VM_GROWSUP )) -return -EFAULT ; - -mmap_assert_write_locked (mm); - -/* Guard against exceeding limits of the address space. */ - address &=PAGE_MASK ; -if (address >= (TASK_SIZE &PAGE_MASK )) -return -ENOMEM ; - address +=PAGE_SIZE ; - -/* Enforce stack_guard_gap */ - gap_addr = address + stack_guard_gap; - -/* Guard against overflow */ -if (gap_addr < address || gap_addr >TASK_SIZE ) - gap_addr =TASK_SIZE ; - - next =find_vma_intersection (mm, vma->vm_end, gap_addr); -if (next &&vma_is_accessible (next)) { -if (!(next->vm_flags &VM_GROWSUP )) -return -ENOMEM ; -/* Check that both stack segments have the same anon_vma? */ - } - -if (next) -vma_iter_prev_range_limit (&vmi, address); - -vma_iter_config (&vmi, vma->vm_start, address); -if (vma_iter_prealloc (&vmi, vma)) -return -ENOMEM ; - -/* We must make sure the anon_vma is allocated. */ -if (unlikely (anon_vma_prepare (vma))) { -vma_iter_free (&vmi); -return -ENOMEM ; - } - -/* Lock the VMA before expanding to prevent concurrent page faults */ -vma_start_write (vma); -/* We update the anon VMA tree. */ -anon_vma_lock_write (vma->anon_vma); - -/* Somebody else might have raced and expanded it already */ -if (address > vma->vm_end) { -unsigned long size, grow; - - size = address - vma->vm_start; - grow = (address - vma->vm_end) >>PAGE_SHIFT ; - - error = -ENOMEM ; -if (vma->vm_pgoff + (size >>PAGE_SHIFT ) >= vma->vm_pgoff) { - error =acct_stack_growth (vma, size, grow); -if (!error) { -if (vma->vm_flags &VM_LOCKED ) - mm->locked_vm += grow; -vm_stat_account (mm, vma->vm_flags, grow); -anon_vma_interval_tree_pre_update_vma (vma); - vma->vm_end = address; -/* Overwrite old entry in mtree. */ -vma_iter_store (&vmi, vma); -anon_vma_interval_tree_post_update_vma (vma); - -perf_event_mmap (vma); - } - } - } -anon_vma_unlock_write (vma->anon_vma); -vma_iter_free (&vmi); -validate_mm (mm); -return error; -} -#endif /* CONFIG_STACK_GROWSUP */ - -/* -* vma is the first one with address < vma->vm_start. Have to extend vma. -* mmap_lock held for writing. -*/ -static int expand_downwards (struct vm_area_struct *vma,unsigned long address) -{ -struct mm_struct *mm = vma->vm_mm; -struct vm_area_struct *prev; -int error =0 ; -VMA_ITERATOR (vmi, mm, vma->vm_start); - -if (!(vma->vm_flags &VM_GROWSDOWN )) -return -EFAULT ; - -mmap_assert_write_locked (mm); - - address &=PAGE_MASK ; -if (address < mmap_min_addr || address <FIRST_USER_ADDRESS ) -return -EPERM ; - -/* Enforce stack_guard_gap */ - prev =vma_prev (&vmi); -/* Check that both stack segments have the same anon_vma? */ -if (prev) { -if (!(prev->vm_flags &VM_GROWSDOWN ) && -vma_is_accessible (prev) && - (address - prev->vm_end < stack_guard_gap)) -return -ENOMEM ; - } - -if (prev) -vma_iter_next_range_limit (&vmi, vma->vm_start); - -vma_iter_config (&vmi, address, vma->vm_end); -if (vma_iter_prealloc (&vmi, vma)) -return -ENOMEM ; - -/* We must make sure the anon_vma is allocated. */ -if (unlikely (anon_vma_prepare (vma))) { -vma_iter_free (&vmi); -return -ENOMEM ; - } - -/* Lock the VMA before expanding to prevent concurrent page faults */ -vma_start_write (vma); -/* We update the anon VMA tree. */ -anon_vma_lock_write (vma->anon_vma); - -/* Somebody else might have raced and expanded it already */ -if (address < vma->vm_start) { -unsigned long size, grow; - - size = vma->vm_end - address; - grow = (vma->vm_start - address) >>PAGE_SHIFT ; - - error = -ENOMEM ; -if (grow <= vma->vm_pgoff) { - error =acct_stack_growth (vma, size, grow); -if (!error) { -if (vma->vm_flags &VM_LOCKED ) - mm->locked_vm += grow; -vm_stat_account (mm, vma->vm_flags, grow); -anon_vma_interval_tree_pre_update_vma (vma); - vma->vm_start = address; - vma->vm_pgoff -= grow; -/* Overwrite old entry in mtree. */ -vma_iter_store (&vmi, vma); -anon_vma_interval_tree_post_update_vma (vma); - -perf_event_mmap (vma); - } - } - } -anon_vma_unlock_write (vma->anon_vma); -vma_iter_free (&vmi); -validate_mm (mm); -return error; -} -/* enforced gap between the expanding stack and other mappings. */ unsigned long stack_guard_gap =256UL <<PAGE_SHIFT ;
mm/vma.c renamed from mm/vma.c~mm-vma-move-stack-expansion-logic-to-mm-vmac +237 -32
284 lines not on this page · raw message
mm/vma.h renamed from mm/vma.h~mm-vma-move-stack-expansion-logic-to-mm-vmac +6 -6
@@ -139,12 +139,6 @@ void validate_mm(struct mm_struct *mm);#define validate_mm (mm) do { } while (0)#endif -/* Required for expand_downwards(). */ -void anon_vma_interval_tree_pre_update_vma (struct vm_area_struct *vma); - -/* Required for expand_downwards(). */ -void anon_vma_interval_tree_post_update_vma (struct vm_area_struct *vma); -int vma_expand (struct vma_merge_struct *vmg);int vma_shrink (struct vma_iterator *vmi,struct vm_area_struct *vma,unsigned long start,unsigned long end,pgoff_t pgoff);
@@ -478,4 +472,10 @@ static inline bool can_modify_vma_madv(s#endif +#if defined(CONFIG_STACK_GROWSUP ) +int expand_upwards (struct vm_area_struct *vma,unsigned long address); +#endif + +int expand_downwards (struct vm_area_struct *vma,unsigned long address); +#endif /* __MM_VMA_H */
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~mm-vma-move-stack-expansion-logic-to-mm-vmac +5 -0
@@ -53,6 +53,11 @@ struct task_struct *get_current(void)return &__current; } +unsigned long rlimit (unsigned int limit) +{ +return (unsigned long )-1 ; +} +/* Helper function to simply allocate a VMA. */ static struct vm_area_struct *alloc_vma(struct mm_struct *mm, unsigned long start,
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-vma-move-stack-expansion-logic-to-mm-vmac +62 -0
78 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
mips-vdso-prefer-do_mmap-to-mmap_region.patch
mm-make-mmap_region-internal.patch