mm-mmap-introduce-vma_set_range.patch removed from -mm tree
The quilt patch titled
Subject: mm/mmap: introduce vma_set_range()
has been removed from the -mm tree. Its filename was
mm-mmap-introduce-vma_set_range.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: Yajun Deng <[email protected]>
Subject: mm/mmap: introduce vma_set_range()
Date: Wed, 24 Jan 2024 11:57:19 +0800
There is a lot of code needs to set the range of vma in mmap.c, introduce vma_set_range() to simplify the code.
Signed-off-by Yajun Deng <[email protected]>
Reviewed-by Liam R. Howlett <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/internal.h | 9 +++++++++ mm/mmap.c | 29 +++++++---------------------- 2 files changed, 16 insertions(+), 22 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-mmap-introduce-vma_set_range +9 -0
@@ -1114,6 +1114,15 @@ static inline bool gup_must_unshare(struextern bool mirrored_kernelcore;extern bool memblock_has_mirror (void ); +static __always_inline void vma_set_range(struct vm_area_struct *vma, +unsigned long start,unsigned long end, +pgoff_t pgoff) +{ + vma->vm_start = start; + vma->vm_end = end; + vma->vm_pgoff = pgoff; +} +static inline bool vma_soft_dirty_enabled (struct vm_area_struct *vma) {/*
mm/mmap.c renamed from mm/mmap.c~mm-mmap-introduce-vma_set_range +7 -22
@@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi,vma_prepare (&vp);vma_adjust_trans_huge (vma, start, end,0 ); - vma->vm_start = start; - vma->vm_end = end; - vma->vm_pgoff = pgoff; +vma_set_range (vma, start, end, pgoff);vma_iter_store (vmi, vma);vma_complete (&vp, vmi, vma->vm_mm);
@@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi,vma_adjust_trans_huge (vma, start, end,0 );vma_iter_clear (vmi); - vma->vm_start = start; - vma->vm_end = end; - vma->vm_pgoff = pgoff; +vma_set_range (vma, start, end, pgoff);vma_complete (&vp, vmi, vma->vm_mm);return 0 ; }
@@ -1015,10 +1011,7 @@ static struct vm_area_structvma_prepare (&vp);vma_adjust_trans_huge (vma, vma_start, vma_end, adj_start); - - vma->vm_start = vma_start; - vma->vm_end = vma_end; - vma->vm_pgoff = vma_pgoff; +vma_set_range (vma, vma_start, vma_end, vma_pgoff);if (vma_expanded)vma_iter_store (vmi, vma);
@@ -2811,11 +2804,9 @@ cannot_expand: }vma_iter_config (&vmi, addr, end); - vma->vm_start = addr; - vma->vm_end = end; +vma_set_range (vma, addr, end, pgoff);vm_flags_init (vma, vm_flags); vma->vm_page_prot =vm_get_page_prot (vm_flags); - vma->vm_pgoff = pgoff;if (file) { vma->vm_file =get_file (file);
@@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_itera goto unacct_fail;vma_set_anonymous (vma); - vma->vm_start = addr; - vma->vm_end = addr + len; - vma->vm_pgoff = addr >>PAGE_SHIFT ; +vma_set_range (vma, addr, addr + len, addr >>PAGE_SHIFT );vm_flags_init (vma, flags); vma->vm_page_prot =vm_get_page_prot (flags);vma_start_write (vma);
@@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct v new_vma =vm_area_dup (vma);if (!new_vma) goto out; - new_vma->vm_start = addr; - new_vma->vm_end = addr + len; - new_vma->vm_pgoff = pgoff; +vma_set_range (new_vma, addr, addr + len, pgoff);if (vma_dup_policy (vma, new_vma)) goto out_free_vma;if (anon_vma_clone (new_vma, vma))
@@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_if (unlikely (vma ==NULL ))return ERR_PTR (-ENOMEM ); - vma->vm_start = addr; - vma->vm_end = addr + len; - +vma_set_range (vma, addr, addr + len,0 );vm_flags_init (vma, (vm_flags | mm->def_flags |VM_DONTEXPAND |VM_SOFTDIRTY ) & ~VM_LOCKED_MASK ); vma->vm_page_prot =vm_get_page_prot (vma->vm_flags);
_
Patches currently in -mm which might be from [email protected] are