mm-mmap-regression-fix-for-unmapped_area_topdown.patch removed from -mm tree
The quilt patch titled
Subject: mm/mmap: regression fix for unmapped_area{_topdown}has been removed from the -mm tree. Its filename was
mm-mmap-regression-fix-for-unmapped_area_topdown.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: "Liam R. Howlett" <[email protected]>
Subject: mm/mmap: regression fix for unmapped_area{_topdown}
Date: Fri, 14 Apr 2023 14:59:19 -0400
The maple tree limits the gap returned to a window that specifically fits what was asked. This may not be optimal in the case of switching search directions or a gap that does not satisfy the requested space for other reasons. Fix the search by retrying the operation and limiting the search window in the rare occasion that a conflict occurs.
---
mm/mmap.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-mmap-regression-fix-for-unmapped_area_topdown +43 -5
@@ -1518,7 +1518,8 @@ static inline int accountable_mapping(st*/ static unsigned long unmapped_area (struct vm_unmapped_area_info *info) { -unsigned long length, gap; +unsigned long length, gap, low_limit; +struct vm_area_struct *tmp;MA_STATE (mas, ¤t->mm->mm_mt,0 ,0 );
@@ -1527,12 +1528,29 @@ static unsigned long unmapped_area(strucif (length < info->length)return -ENOMEM ; -if (mas_empty_area (&mas, info->low_limit, info->high_limit -1 , - length)) + low_limit = info->low_limit; +retry: +if (mas_empty_area (&mas, low_limit, info->high_limit -1 , length))return -ENOMEM ; gap = mas.index; gap += (info->align_offset - gap) & info->align_mask; + tmp =mas_next (&mas,ULONG_MAX ); +if (tmp && (tmp->vm_flags &VM_GROWSDOWN )) {/* Avoid prev check if possible */ +if (vm_start_gap (tmp) < gap + length -1 ) { + low_limit = tmp->vm_end; +mas_reset (&mas); + goto retry; + } + }else { + tmp =mas_prev (&mas,0 ); +if (tmp &&vm_end_gap (tmp) > gap) { + low_limit =vm_end_gap (tmp); +mas_reset (&mas); + goto retry; + } + } +return gap; }
@@ -1548,7 +1566,8 @@ static unsigned long unmapped_area(struc*/ static unsigned long unmapped_area_topdown (struct vm_unmapped_area_info *info) { -unsigned long length, gap; +unsigned long length, gap, high_limit, gap_end; +struct vm_area_struct *tmp;MA_STATE (mas, ¤t->mm->mm_mt,0 ,0 );/* Adjust search length to account for worst case alignment overhead */
@@ -1556,12 +1575,31 @@ static unsigned long unmapped_area_topdoif (length < info->length)return -ENOMEM ; -if (mas_empty_area_rev (&mas, info->low_limit, info->high_limit -1 , + high_limit = info->high_limit; +retry: +if (mas_empty_area_rev (&mas, info->low_limit, high_limit -1 , length))return -ENOMEM ; gap = mas.last +1 - info->length; gap -= (gap - info->align_offset) & info->align_mask; + gap_end = mas.last; + tmp =mas_next (&mas,ULONG_MAX ); +if (tmp && (tmp->vm_flags &VM_GROWSDOWN )) {/* Avoid prev check if possible */ +if (vm_start_gap (tmp) <= gap_end) { + high_limit =vm_start_gap (tmp); +mas_reset (&mas); + goto retry; + } + }else { + tmp =mas_prev (&mas,0 ); +if (tmp &&vm_end_gap (tmp) > gap) { + high_limit = tmp->vm_start; +mas_reset (&mas); + goto retry; + } + } +return gap; }
_
Patches currently in -mm which might be from [email protected] are