superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/vma: refactor vma_modify_flags_name() to vma_modify_name() 

The single instance in which we use this function doesn't actually need to
change VMA flags, so remove this parameter and update the caller
accordingly.

[lorenzo.stoakes@oracle.com: correct comment]
  Link: https://lkml.kernel.org/r/77f45b2e-a748-4635-9381-a5051091087f@lucifer.local
Link: https://lkml.kernel.org/r/20250714135839.178032-1-lorenzo.stoakes@oracle.com
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Jann Horn <jannh@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
pull/1311/head
Lorenzo Stoakes 2025-07-14 14:58:39 +01:00 committed by Andrew Morton
parent 3865301dc5
commit cfea89210a
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/madvise.c
View File

@ -144,8 +144,8 @@ static int replace_anon_vma_name(struct vm_area_struct *vma,
} }
#endif /* CONFIG_ANON_VMA_NAME */ #endif /* CONFIG_ANON_VMA_NAME */
/* /*
* Update the vm_flags and/or anon_name on region of a vma, splitting it or * Update the vm_flags or anon_name on region of a vma, splitting it or merging
* merging it as necessary. Must be called with mmap_lock held for writing. * it as necessary. Must be called with mmap_lock held for writing.
*/ */
static int madvise_update_vma(vm_flags_t new_flags, static int madvise_update_vma(vm_flags_t new_flags,
struct madvise_behavior *madv_behavior) struct madvise_behavior *madv_behavior)
@ -161,8 +161,8 @@ static int madvise_update_vma(vm_flags_t new_flags,
return 0; return 0;
if (set_new_anon_name) if (set_new_anon_name)
vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, vma = vma_modify_name(&vmi, madv_behavior->prev, vma,
range->start, range->end, new_flags, anon_name); range->start, range->end, anon_name);
else else
vma = vma_modify_flags(&vmi, madv_behavior->prev, vma, vma = vma_modify_flags(&vmi, madv_behavior->prev, vma,
range->start, range->end, new_flags); range->start, range->end, new_flags);

4
mm/vma.c
View File

@ -1650,17 +1650,15 @@ struct vm_area_struct *vma_modify_flags(
} }
struct vm_area_struct struct vm_area_struct
*vma_modify_flags_name(struct vma_iterator *vmi, *vma_modify_name(struct vma_iterator *vmi,
struct vm_area_struct *prev, struct vm_area_struct *prev,
struct vm_area_struct *vma, struct vm_area_struct *vma,
unsigned long start, unsigned long start,
unsigned long end, unsigned long end,
vm_flags_t vm_flags,
struct anon_vma_name *new_name) struct anon_vma_name *new_name)
{ {
VMG_VMA_STATE(vmg, vmi, prev, vma, start, end); VMG_VMA_STATE(vmg, vmi, prev, vma, start, end);
vmg.vm_flags = vm_flags;
vmg.anon_name = new_name; vmg.anon_name = new_name;
return vma_modify(&vmg); return vma_modify(&vmg);

15
mm/vma.h
View File

@ -290,15 +290,14 @@ __must_check struct vm_area_struct
unsigned long start, unsigned long end, unsigned long start, unsigned long end,
vm_flags_t vm_flags); vm_flags_t vm_flags);
/* We are about to modify the VMA's flags and/or anon_name. */ /* We are about to modify the VMA's anon_name. */
__must_check struct vm_area_struct __must_check struct vm_area_struct
*vma_modify_flags_name(struct vma_iterator *vmi, *vma_modify_name(struct vma_iterator *vmi,
struct vm_area_struct *prev, struct vm_area_struct *prev,
struct vm_area_struct *vma, struct vm_area_struct *vma,
unsigned long start, unsigned long start,
unsigned long end, unsigned long end,
vm_flags_t vm_flags, struct anon_vma_name *new_name);
struct anon_vma_name *new_name);
/* We are about to modify the VMA's memory policy. */ /* We are about to modify the VMA's memory policy. */
__must_check struct vm_area_struct __must_check struct vm_area_struct