Commit 412c6ef9 authored by Yajun Deng's avatar Yajun Deng Committed by Andrew Morton

mm/mmap: introduce vma_set_range()

There is a lot of code needs to set the range of vma in mmap.c, introduce
vma_set_range() to simplify the code.

Link: https://lkml.kernel.org/r/20240124035719.3685193-1-yajun.deng@linux.devSigned-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 83e68f25
...@@ -1114,6 +1114,15 @@ static inline bool gup_must_unshare(struct vm_area_struct *vma, ...@@ -1114,6 +1114,15 @@ static inline bool gup_must_unshare(struct vm_area_struct *vma,
extern bool mirrored_kernelcore; extern bool mirrored_kernelcore;
extern bool memblock_has_mirror(void); 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) static inline bool vma_soft_dirty_enabled(struct vm_area_struct *vma)
{ {
/* /*
......
...@@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
vma_prepare(&vp); vma_prepare(&vp);
vma_adjust_trans_huge(vma, start, end, 0); vma_adjust_trans_huge(vma, start, end, 0);
vma->vm_start = start; vma_set_range(vma, start, end, pgoff);
vma->vm_end = end;
vma->vm_pgoff = pgoff;
vma_iter_store(vmi, vma); vma_iter_store(vmi, vma);
vma_complete(&vp, vmi, vma->vm_mm); vma_complete(&vp, vmi, vma->vm_mm);
...@@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
vma_adjust_trans_huge(vma, start, end, 0); vma_adjust_trans_huge(vma, start, end, 0);
vma_iter_clear(vmi); vma_iter_clear(vmi);
vma->vm_start = start; vma_set_range(vma, start, end, pgoff);
vma->vm_end = end;
vma->vm_pgoff = pgoff;
vma_complete(&vp, vmi, vma->vm_mm); vma_complete(&vp, vmi, vma->vm_mm);
return 0; return 0;
} }
...@@ -1015,10 +1011,7 @@ static struct vm_area_struct ...@@ -1015,10 +1011,7 @@ static struct vm_area_struct
vma_prepare(&vp); vma_prepare(&vp);
vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start); vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start);
vma_set_range(vma, vma_start, vma_end, vma_pgoff);
vma->vm_start = vma_start;
vma->vm_end = vma_end;
vma->vm_pgoff = vma_pgoff;
if (vma_expanded) if (vma_expanded)
vma_iter_store(vmi, vma); vma_iter_store(vmi, vma);
...@@ -2811,11 +2804,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr, ...@@ -2811,11 +2804,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
} }
vma_iter_config(&vmi, addr, end); vma_iter_config(&vmi, addr, end);
vma->vm_start = addr; vma_set_range(vma, addr, end, pgoff);
vma->vm_end = end;
vm_flags_init(vma, vm_flags); vm_flags_init(vma, vm_flags);
vma->vm_page_prot = vm_get_page_prot(vm_flags); vma->vm_page_prot = vm_get_page_prot(vm_flags);
vma->vm_pgoff = pgoff;
if (file) { if (file) {
vma->vm_file = get_file(file); vma->vm_file = get_file(file);
...@@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
goto unacct_fail; goto unacct_fail;
vma_set_anonymous(vma); vma_set_anonymous(vma);
vma->vm_start = addr; vma_set_range(vma, addr, addr + len, addr >> PAGE_SHIFT);
vma->vm_end = addr + len;
vma->vm_pgoff = addr >> PAGE_SHIFT;
vm_flags_init(vma, flags); vm_flags_init(vma, flags);
vma->vm_page_prot = vm_get_page_prot(flags); vma->vm_page_prot = vm_get_page_prot(flags);
vma_start_write(vma); vma_start_write(vma);
...@@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, ...@@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
new_vma = vm_area_dup(vma); new_vma = vm_area_dup(vma);
if (!new_vma) if (!new_vma)
goto out; goto out;
new_vma->vm_start = addr; vma_set_range(new_vma, addr, addr + len, pgoff);
new_vma->vm_end = addr + len;
new_vma->vm_pgoff = pgoff;
if (vma_dup_policy(vma, new_vma)) if (vma_dup_policy(vma, new_vma))
goto out_free_vma; goto out_free_vma;
if (anon_vma_clone(new_vma, vma)) if (anon_vma_clone(new_vma, vma))
...@@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_special_mapping( ...@@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_special_mapping(
if (unlikely(vma == NULL)) if (unlikely(vma == NULL))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
vma->vm_start = addr; vma_set_range(vma, addr, addr + len, 0);
vma->vm_end = addr + len;
vm_flags_init(vma, (vm_flags | mm->def_flags | vm_flags_init(vma, (vm_flags | mm->def_flags |
VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK); VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK);
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment