mm: add VMA iterator

This thin layer of abstraction over the maple tree state is for iterating
over VMAs.  You can go forwards, go backwards or ask where the iterator
is.  Rename the existing vma_next() to __vma_next() -- it will be removed
by the end of this series.

Link: https://lkml.kernel.org/r/20220504010716.661115-11-Liam.Howlett@oracle.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-10-Liam.Howlett@oracle.com
Link: https://lkml.kernel.org/r/20220720021727.17018-10-Liam.Howlett@oracle.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Hulk Robot <hulkci@huawei.com>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index cd754a3327ce056c6e3d1fe7d664392e833e4e01..1027ca66827dff9a6fa51e0bcf5c4a1af172e3d4 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -658,6 +658,38 @@ static inline bool vma_is_accessible(struct vm_area_struct *vma)
        return vma->vm_flags & VM_ACCESS_FLAGS;
 }
 
+static inline
+struct vm_area_struct *vma_find(struct vma_iterator *vmi, unsigned long max)
+{
+       return mas_find(&vmi->mas, max);
+}
+
+static inline struct vm_area_struct *vma_next(struct vma_iterator *vmi)
+{
+       /*
+        * Uses vma_find() to get the first VMA when the iterator starts.
+        * Calling mas_next() could skip the first entry.
+        */
+       return vma_find(vmi, ULONG_MAX);
+}
+
+static inline struct vm_area_struct *vma_prev(struct vma_iterator *vmi)
+{
+       return mas_prev(&vmi->mas, 0);
+}
+
+static inline unsigned long vma_iter_addr(struct vma_iterator *vmi)
+{
+       return vmi->mas.index;
+}
+
+#define for_each_vma(__vmi, __vma)                                     \
+       while (((__vma) = vma_next(&(__vmi))) != NULL)
+
+/* The MM code likes to work with exclusive end addresses */
+#define for_each_vma_range(__vmi, __vma, __end)                                \
+       while (((__vma) = vma_find(&(__vmi), (__end) - 1)) != NULL)
+
 #ifdef CONFIG_SHMEM
 /*
  * The vma_is_shmem is not inline because it is used only by slow

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index dcc2416f918cf33c8a67342be2df7733a6041693..ae8fc7b36548ad9f90b8ddb3b81587ef81586219 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -701,6 +701,27 @@ static inline cpumask_t *mm_cpumask(struct mm_struct *mm)
        return (struct cpumask *)&mm->cpu_bitmap;
 }
 
+struct vma_iterator {
+       struct ma_state mas;
+};
+
+#define VMA_ITERATOR(name, __mm, __addr)                               \
+       struct vma_iterator name = {                                    \
+               .mas = {                                                \
+                       .tree = &(__mm)->mm_mt,                         \
+                       .index = __addr,                                \
+                       .node = MAS_START,                              \
+               },                                                      \
+       }
+
+static inline void vma_iter_init(struct vma_iterator *vmi,
+               struct mm_struct *mm, unsigned long addr)
+{
+       vmi->mas.tree = &mm->mm_mt;
+       vmi->mas.index = addr;
+       vmi->mas.node = MAS_START;
+}
+
 struct mmu_gather;
 extern void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm);
 extern void tlb_gather_mmu_fullmm(struct mmu_gather *tlb, struct mm_struct *mm);

diff --git a/mm/mmap.c b/mm/mmap.c
index efa9e9f1d6bb03797a77670e543ebf55c7f90d38..119211401fa685078ea1cf84a8ade5a5a9e49bd5 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -586,7 +586,7 @@ static int find_vma_links(struct mm_struct *mm, unsigned long addr,
 }
 
 /*
- * vma_next() - Get the next VMA.
+ * __vma_next() - Get the next VMA.
  * @mm: The mm_struct.
  * @vma: The current vma.
  *
@@ -594,7 +594,7 @@ static int find_vma_links(struct mm_struct *mm, unsigned long addr,
  *
  * Returns: The next VMA after @vma.
  */
-static inline struct vm_area_struct *vma_next(struct mm_struct *mm,
+static inline struct vm_area_struct *__vma_next(struct mm_struct *mm,
                                         struct vm_area_struct *vma)
 {
        if (!vma)
@@ -1291,7 +1291,7 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
        if (vm_flags & VM_SPECIAL)
                return NULL;
 
-       next = vma_next(mm, prev);
+       next = __vma_next(mm, prev);
        area = next;
        if (area && area->vm_end == end)                /* cases 6, 7, 8 */
                next = next->vm_next;
@@ -2838,7 +2838,7 @@ static void unmap_region(struct mm_struct *mm,
                struct vm_area_struct *vma, struct vm_area_struct *prev,
                unsigned long start, unsigned long end)
 {
-       struct vm_area_struct *next = vma_next(mm, prev);
+       struct vm_area_struct *next = __vma_next(mm, prev);
        struct mmu_gather tlb;
 
        lru_add_drain();
@@ -3046,7 +3046,7 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len,
                if (error)
                        goto split_failed;
        }
-       vma = vma_next(mm, prev);
+       vma = __vma_next(mm, prev);
 
        if (unlikely(uf)) {
                /*