mm-set-up-vma-iterator-for-vma_iter_prealloc-calls.patch removed from -mm tree
The quilt patch titled
Subject: mm: set up vma iterator for vma_iter_prealloc() calls
has been removed from the -mm tree. Its filename was
mm-set-up-vma-iterator-for-vma_iter_prealloc-calls.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: "Liam R. Howlett" <[email protected]>
Subject: mm: set up vma iterator for vma_iter_prealloc() calls
Date: Mon, 24 Jul 2023 14:31:52 -0400
Set the correct limits for vma_iter_prealloc() calls so that the maple tree can be smarter about how many nodes are needed.
---
fs/exec.c | 1 mm/internal.h | 18 ++++-------- mm/mmap.c | 69 +++++++++++++++++++++++++++++------------------- mm/nommu.c | 33 +++++++++------------- 4 files changed, 64 insertions(+), 57 deletions(-)
fs/exec.c renamed from fs/exec.c~mm-set-up-vma-iterator-for-vma_iter_prealloc-calls +1 -0
@@ -701,6 +701,7 @@ static int shift_arg_pages(struct vm_areif (vma !=vma_next (&vmi))return -EFAULT ; +vma_iter_prev_range (&vmi);/* * cover the whole range: [new_start, old_end) */
mm/internal.h renamed from mm/internal.h~mm-set-up-vma-iterator-for-vma_iter_prealloc-calls +7 -11
@@ -1052,23 +1052,21 @@ static inline void vma_iter_config(struc/* * VMA Iterator functions shared between nommu and mmap */ -static inline int vma_iter_prealloc (struct vma_iterator *vmi) +static inline int vma_iter_prealloc (struct vma_iterator *vmi, +struct vm_area_struct *vma) { -return mas_preallocate (&vmi->mas,NULL ,GFP_KERNEL ); +return mas_preallocate (&vmi->mas, vma,GFP_KERNEL ); } -static inline void vma_iter_clear (struct vma_iterator *vmi, -unsigned long start,unsigned long end) +static inline void vma_iter_clear (struct vma_iterator *vmi) { -mas_set_range (&vmi->mas, start, end -1 );mas_store_prealloc (&vmi->mas,NULL ); }static inline int vma_iter_clear_gfp (struct vma_iterator *vmi,unsigned long start,unsigned long end,gfp_t gfp) { - vmi->mas.index = start; - vmi->mas.last = end -1 ; +__mas_set_range (&vmi->mas, start, end -1 );mas_store_gfp (&vmi->mas,NULL , gfp);if (unlikely (mas_is_err (&vmi->mas)))return -ENOMEM ;
@@ -1105,8 +1103,7 @@ static inline void vma_iter_store(struct ((vmi->mas.index > vma->vm_start) || (vmi->mas.last < vma->vm_start)))vma_iter_invalidate (vmi); - vmi->mas.index = vma->vm_start; - vmi->mas.last = vma->vm_end -1 ; +__mas_set_range (&vmi->mas, vma->vm_start, vma->vm_end -1 );mas_store_prealloc (&vmi->mas, vma); }
@@ -1117,8 +1114,7 @@ static inline int vma_iter_store_gfp(str ((vmi->mas.index > vma->vm_start) || (vmi->mas.last < vma->vm_start)))vma_iter_invalidate (vmi); - vmi->mas.index = vma->vm_start; - vmi->mas.last = vma->vm_end -1 ; +__mas_set_range (&vmi->mas, vma->vm_start, vma->vm_end -1 );mas_store_gfp (&vmi->mas, vma, gfp);if (unlikely (mas_is_err (&vmi->mas)))return -ENOMEM ;
mm/mmap.c renamed from mm/mmap.c~mm-set-up-vma-iterator-for-vma_iter_prealloc-calls +42 -27
178 lines not on this page · raw message
mm/nommu.c renamed from mm/nommu.c~mm-set-up-vma-iterator-for-vma_iter_prealloc-calls +14 -19
@@ -583,7 +583,8 @@ static int delete_vma_from_mm(struct vm_ {VMA_ITERATOR (vmi, vma->vm_mm, vma->vm_start); -if (vma_iter_prealloc (&vmi)) { +vma_iter_config (&vmi, vma->vm_start, vma->vm_end); +if (vma_iter_prealloc (&vmi, vma)) {pr_warn ("Allocation of vma tree for process %d failed\n" , current->pid);return -ENOMEM ;
@@ -591,7 +592,7 @@ static int delete_vma_from_mm(struct vm_cleanup_vma_from_mm (vma);/* remove from the MM's tree and list */ -vma_iter_clear (&vmi, vma->vm_start, vma->vm_end); +vma_iter_clear (&vmi);return 0 ; }/*
@@ -1054,9 +1055,6 @@ unsigned long do_mmap(struct file *file,if (!vma) goto error_getting_vma; -if (vma_iter_prealloc (&vmi)) - goto error_vma_iter_prealloc; - region->vm_usage =1 ; region->vm_flags = vm_flags; region->vm_pgoff = pgoff;
@@ -1198,6 +1196,10 @@ unsigned long do_mmap(struct file *file, share:BUG_ON (!vma->vm_region); +vma_iter_config (&vmi, vma->vm_start, vma->vm_end); +if (vma_iter_prealloc (&vmi, vma)) + goto error_just_free; +setup_vma_to_mm (vma, current->mm); current->mm->map_count++;/* add the VMA to the tree */
@@ -1244,14 +1246,6 @@ error_getting_region: len, current->pid);show_mem ();return -ENOMEM ; - -error_vma_iter_prealloc: -kmem_cache_free (vm_region_jar, region); -vm_area_free (vma); -pr_warn ("Allocation of vma tree for process %d failed\n" , current->pid); -show_mem (); -return -ENOMEM ; - } unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
@@ -1336,12 +1330,6 @@ int split_vma(struct vma_iterator *vmi,if (!new) goto err_vma_dup; -if (vma_iter_prealloc (vmi)) { -pr_warn ("Allocation of vma tree for process %d failed\n" , - current->pid); - goto err_vmi_preallocate; - } -/* most fields are the same, copy all, and then fixup */ *region = *vma->vm_region; new->vm_region = region;
@@ -1355,6 +1343,13 @@ int split_vma(struct vma_iterator *vmi, region->vm_pgoff = new->vm_pgoff += npages; } +vma_iter_config (vmi, new->vm_start, new->vm_end); +if (vma_iter_prealloc (vmi, vma)) { +pr_warn ("Allocation of vma tree for process %d failed\n" , + current->pid); + goto err_vmi_preallocate; + } +if (new->vm_ops && new->vm_ops->open) new->vm_ops->open (new);
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch