mm-vma-move-unmapped_area-internals-to-mm-vmac.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: move unmapped_area() internals to mm/vma.c
has been removed from the -mm tree. Its filename was
mm-vma-move-unmapped_area-internals-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 unmapped_area() internals to mm/vma.c
Date: Tue, 3 Dec 2024 18:05:09 +0000
We want to be able to unit test the unmapped area logic, so move it to mm/vma.c. The wrappers which invoke this remain in place in mm/mmap.c.
In addition, naturally, update the existing test code to enable this to be compiled in userland.
---
mm/mmap.c | 109 ----------------------------- mm/vma.c | 109 +++++++++++++++++++++++++++++ mm/vma.h | 3 tools/testing/vma/vma.c | 6 + tools/testing/vma/vma_internal.h | 59 +++++++++++++++ 5 files changed, 177 insertions(+), 109 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-vma-move-unmapped_area-internals-to-mm-vmac +0 -109
@@ -580,115 +580,6 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar }#endif /* __ARCH_WANT_SYS_OLD_MMAP */ -/** -* unmapped_area() - Find an area between the low_limit and the high_limit with -* the correct alignment and offset, all from @info. Note: current->mm is used -* for the search. -* -* @info: The unmapped area information including the range [low_limit - -* high_limit), the alignment offset and mask. -* -* Return: A memory address or -ENOMEM. -*/ -static unsigned long unmapped_area (struct vm_unmapped_area_info *info) -{ -unsigned long length, gap; -unsigned long low_limit, high_limit; -struct vm_area_struct *tmp; -VMA_ITERATOR (vmi, current->mm,0 ); - -/* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask + info->start_gap; -if (length < info->length) -return -ENOMEM ; - - low_limit = info->low_limit; -if (low_limit < mmap_min_addr) - low_limit = mmap_min_addr; - high_limit = info->high_limit; -retry: -if (vma_iter_area_lowest (&vmi, low_limit, high_limit, length)) -return -ENOMEM ; - -/* -* Adjust for the gap first so it doesn't interfere with the -* later alignment. The first step is the minimum needed to -* fulill the start gap, the next steps is the minimum to align -* that. It is the minimum needed to fulill both. -*/ - gap =vma_iter_addr (&vmi) + info->start_gap; - gap += (info->align_offset - gap) & info->align_mask; - tmp =vma_next (&vmi); -if (tmp && (tmp->vm_flags &VM_STARTGAP_FLAGS )) {/* Avoid prev check if possible */ -if (vm_start_gap (tmp) < gap + length -1 ) { - low_limit = tmp->vm_end; -vma_iter_reset (&vmi); - goto retry; - } - }else { - tmp =vma_prev (&vmi); -if (tmp &&vm_end_gap (tmp) > gap) { - low_limit =vm_end_gap (tmp); -vma_iter_reset (&vmi); - goto retry; - } - } - -return gap; -} - -/** -* unmapped_area_topdown() - Find an area between the low_limit and the -* high_limit with the correct alignment and offset at the highest available -* address, all from @info. Note: current->mm is used for the search. -* -* @info: The unmapped area information including the range [low_limit - -* high_limit), the alignment offset and mask. -* -* Return: A memory address or -ENOMEM. -*/ -static unsigned long unmapped_area_topdown (struct vm_unmapped_area_info *info) -{ -unsigned long length, gap, gap_end; -unsigned long low_limit, high_limit; -struct vm_area_struct *tmp; -VMA_ITERATOR (vmi, current->mm,0 ); - -/* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask + info->start_gap; -if (length < info->length) -return -ENOMEM ; - - low_limit = info->low_limit; -if (low_limit < mmap_min_addr) - low_limit = mmap_min_addr; - high_limit = info->high_limit; -retry: -if (vma_iter_area_highest (&vmi, low_limit, high_limit, length)) -return -ENOMEM ; - - gap =vma_iter_end (&vmi) - info->length; - gap -= (gap - info->align_offset) & info->align_mask; - gap_end =vma_iter_end (&vmi); - tmp =vma_next (&vmi); -if (tmp && (tmp->vm_flags &VM_STARTGAP_FLAGS )) {/* Avoid prev check if possible */ -if (vm_start_gap (tmp) < gap_end) { - high_limit =vm_start_gap (tmp); -vma_iter_reset (&vmi); - goto retry; - } - }else { - tmp =vma_prev (&vmi); -if (tmp &&vm_end_gap (tmp) > gap) { - high_limit = tmp->vm_start; -vma_iter_reset (&vmi); - goto retry; - } - } - -return gap; -} -/* * Determine if the allocation needs to ensure that there is no * existing mapping within it's guard gaps, for use as start_gap.
mm/vma.c renamed from mm/vma.c~mm-vma-move-unmapped_area-internals-to-mm-vmac +109 -0
112 lines not on this page · raw message
mm/vma.h renamed from mm/vma.h~mm-vma-move-unmapped_area-internals-to-mm-vmac +3 -0
@@ -250,6 +250,9 @@ unsigned long __mmap_region(struct fileint do_brk_flags (struct vma_iterator *vmi,struct vm_area_struct *brkvma,unsigned long addr,unsigned long request,unsigned long flags); +unsigned long unmapped_area (struct vm_unmapped_area_info *info); +unsigned long unmapped_area_topdown (struct vm_unmapped_area_info *info); +static inline bool vma_wants_manual_pte_write_upgrade (struct vm_area_struct *vma) {/*
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~mm-vma-move-unmapped_area-internals-to-mm-vmac +6 -0
@@ -18,6 +18,12 @@ static bool fail_prealloc;#define vma_iter_prealloc (vmi, vma) \ (fail_prealloc ? -ENOMEM : mas_preallocate(&(vmi)->mas, (vma), GFP_KERNEL)) +#define CONFIG_DEFAULT_MMAP_MIN_ADDR 65536 + +unsigned long mmap_min_addr =CONFIG_DEFAULT_MMAP_MIN_ADDR ; +unsigned long dac_mmap_min_addr =CONFIG_DEFAULT_MMAP_MIN_ADDR ; +unsigned long stack_guard_gap =256UL <<PAGE_SHIFT ; +/* * Directly import the VMA implementation here. Our vma_internal.h wrapper * provides userland-equivalent functionality for everything vma.c uses.
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-vma-move-unmapped_area-internals-to-mm-vmac +59 -0
87 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