Add a limit to the vma search instead of using the start and end of the
one passed in.
No functional changes intended.
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
mm/vma.c | 6 ++++--
mm/vma.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/mm/vma.c b/mm/vma.c
index abe0da33c8446..a648e0555c873 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -474,6 +474,7 @@ void remove_vma(struct vm_area_struct *vma)
* Called with the mm semaphore held.
*/
void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
+ unsigned long vma_min, unsigned long vma_max,
struct vm_area_struct *prev, struct vm_area_struct *next)
{
struct mm_struct *mm = vma->vm_mm;
@@ -481,7 +482,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
tlb_gather_mmu(&tlb, mm);
update_hiwater_rss(mm);
- unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
+ unmap_vmas(&tlb, mas, vma, vma_min, vma_max, vma_max,
/* mm_wr_locked = */ true);
mas_set(mas, vma->vm_end);
free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
@@ -2417,7 +2418,8 @@ static int __mmap_new_file_vma(struct mmap_state *map,
vma_iter_set(vmi, vma->vm_end);
/* Undo any partial mapping done by a device driver. */
- unmap_region(&vmi->mas, vma, map->prev, map->next);
+ unmap_region(&vmi->mas, vma, vma->vm_start, vma->vm_end,
+ map->prev, map->next);
return error;
}
diff --git a/mm/vma.h b/mm/vma.h
index 9183fe5490090..a9d0cef684ddb 100644
--- a/mm/vma.h
+++ b/mm/vma.h
@@ -261,6 +261,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,
void remove_vma(struct vm_area_struct *vma);
void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
+ unsigned long min, unsigned long max,
struct vm_area_struct *prev, struct vm_area_struct *next);
/* We are about to modify the VMA's flags. */
--
2.47.2On 09.09.25 21:09, Liam R. Howlett wrote: > Add a limit to the vma search instead of using the start and end of the > one passed in. > > No functional changes intended. > > Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> > --- > mm/vma.c | 6 ++++-- > mm/vma.h | 1 + > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/mm/vma.c b/mm/vma.c > index abe0da33c8446..a648e0555c873 100644 > --- a/mm/vma.c > +++ b/mm/vma.c > @@ -474,6 +474,7 @@ void remove_vma(struct vm_area_struct *vma) > * Called with the mm semaphore held. > */ > void unmap_region(struct ma_state *mas, struct vm_area_struct *vma, > + unsigned long vma_min, unsigned long vma_max, Why not call it "start" and "end" ? :) In any case Reviewed-by: David Hildenbrand <david@redhat.com> -- Cheers David / dhildenb
On Tue, Sep 09, 2025 at 03:09:39PM -0400, Liam R. Howlett wrote:
> Add a limit to the vma search instead of using the start and end of the
> one passed in.
>
> No functional changes intended.
>
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
OK I see you are splitting this up then addressing the args thing in a later
patch so that's all good :)
One nit below, but otherwise LGTM so:
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> ---
> mm/vma.c | 6 ++++--
> mm/vma.h | 1 +
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/mm/vma.c b/mm/vma.c
> index abe0da33c8446..a648e0555c873 100644
> --- a/mm/vma.c
> +++ b/mm/vma.c
> @@ -474,6 +474,7 @@ void remove_vma(struct vm_area_struct *vma)
> * Called with the mm semaphore held.
> */
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long vma_min, unsigned long vma_max,
> struct vm_area_struct *prev, struct vm_area_struct *next)
> {
> struct mm_struct *mm = vma->vm_mm;
> @@ -481,7 +482,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
>
> tlb_gather_mmu(&tlb, mm);
> update_hiwater_rss(mm);
> - unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
> + unmap_vmas(&tlb, mas, vma, vma_min, vma_max, vma_max,
> /* mm_wr_locked = */ true);
> mas_set(mas, vma->vm_end);
> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
> @@ -2417,7 +2418,8 @@ static int __mmap_new_file_vma(struct mmap_state *map,
>
> vma_iter_set(vmi, vma->vm_end);
> /* Undo any partial mapping done by a device driver. */
> - unmap_region(&vmi->mas, vma, map->prev, map->next);
> + unmap_region(&vmi->mas, vma, vma->vm_start, vma->vm_end,
> + map->prev, map->next);
>
> return error;
> }
> diff --git a/mm/vma.h b/mm/vma.h
> index 9183fe5490090..a9d0cef684ddb 100644
> --- a/mm/vma.h
> +++ b/mm/vma.h
> @@ -261,6 +261,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,
> void remove_vma(struct vm_area_struct *vma);
>
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long min, unsigned long max,
NIT: you're changing the name of the parameter for min, max to vma_min, vma_max
between here and the implementation. Let's keep that consistent!
> struct vm_area_struct *prev, struct vm_area_struct *next);
>
> /* We are about to modify the VMA's flags. */
> --
> 2.47.2
>
On Tue, Sep 09, 2025 at 03:09:39PM -0400, Liam R. Howlett wrote:
> Add a limit to the vma search instead of using the start and end of the
> one passed in.
>
> No functional changes intended.
>
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> ---
> mm/vma.c | 6 ++++--
> mm/vma.h | 1 +
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/mm/vma.c b/mm/vma.c
> index abe0da33c8446..a648e0555c873 100644
> --- a/mm/vma.c
> +++ b/mm/vma.c
> @@ -474,6 +474,7 @@ void remove_vma(struct vm_area_struct *vma)
> * Called with the mm semaphore held.
> */
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long vma_min, unsigned long vma_max,
> struct vm_area_struct *prev, struct vm_area_struct *next)
> {
> struct mm_struct *mm = vma->vm_mm;
> @@ -481,7 +482,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
>
> tlb_gather_mmu(&tlb, mm);
> update_hiwater_rss(mm);
> - unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
> + unmap_vmas(&tlb, mas, vma, vma_min, vma_max, vma_max,
> /* mm_wr_locked = */ true);
> mas_set(mas, vma->vm_end);
> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
> @@ -2417,7 +2418,8 @@ static int __mmap_new_file_vma(struct mmap_state *map,
>
> vma_iter_set(vmi, vma->vm_end);
> /* Undo any partial mapping done by a device driver. */
> - unmap_region(&vmi->mas, vma, map->prev, map->next);
> + unmap_region(&vmi->mas, vma, vma->vm_start, vma->vm_end,
> + map->prev, map->next);
>
> return error;
> }
> diff --git a/mm/vma.h b/mm/vma.h
> index 9183fe5490090..a9d0cef684ddb 100644
> --- a/mm/vma.h
> +++ b/mm/vma.h
> @@ -261,6 +261,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,
> void remove_vma(struct vm_area_struct *vma);
>
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long min, unsigned long max,
> struct vm_area_struct *prev, struct vm_area_struct *next);
>
nit: min and max don't match the arg names in the actual definition of the function
Reviewed-by: Pedro Falcato <pfalcato@suse.de>
--
Pedro
On Tue, Sep 9, 2025 at 12:10 PM Liam R. Howlett <Liam.Howlett@oracle.com> wrote:
>
> Add a limit to the vma search instead of using the start and end of the
> one passed in.
Would be good to explain why this is needed. I'm sure I'll find the
answer in the later patches though.
>
> No functional changes intended.
>
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
> ---
> mm/vma.c | 6 ++++--
> mm/vma.h | 1 +
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/mm/vma.c b/mm/vma.c
> index abe0da33c8446..a648e0555c873 100644
> --- a/mm/vma.c
> +++ b/mm/vma.c
> @@ -474,6 +474,7 @@ void remove_vma(struct vm_area_struct *vma)
> * Called with the mm semaphore held.
> */
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long vma_min, unsigned long vma_max,
> struct vm_area_struct *prev, struct vm_area_struct *next)
> {
> struct mm_struct *mm = vma->vm_mm;
> @@ -481,7 +482,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
>
> tlb_gather_mmu(&tlb, mm);
> update_hiwater_rss(mm);
> - unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
> + unmap_vmas(&tlb, mas, vma, vma_min, vma_max, vma_max,
> /* mm_wr_locked = */ true);
> mas_set(mas, vma->vm_end);
> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
> @@ -2417,7 +2418,8 @@ static int __mmap_new_file_vma(struct mmap_state *map,
>
> vma_iter_set(vmi, vma->vm_end);
> /* Undo any partial mapping done by a device driver. */
> - unmap_region(&vmi->mas, vma, map->prev, map->next);
> + unmap_region(&vmi->mas, vma, vma->vm_start, vma->vm_end,
> + map->prev, map->next);
>
> return error;
> }
> diff --git a/mm/vma.h b/mm/vma.h
> index 9183fe5490090..a9d0cef684ddb 100644
> --- a/mm/vma.h
> +++ b/mm/vma.h
> @@ -261,6 +261,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,
> void remove_vma(struct vm_area_struct *vma);
>
> void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
> + unsigned long min, unsigned long max,
> struct vm_area_struct *prev, struct vm_area_struct *next);
>
> /* We are about to modify the VMA's flags. */
> --
> 2.47.2
>
© 2016 - 2025 Red Hat, Inc.