mm: make vma_merge() and split_vma() internal

Now the common pattern of - attempting a merge via vma_merge() and should
this fail splitting VMAs via split_vma() - has been abstracted, the former
can be placed into mm/internal.h and the latter made static.

In addition, the split_vma() nommu variant also need not be exported.

Link: https://lkml.kernel.org/r/405f2be10e20c4e9fbcc9fe6b2dfea105f6642e0.1697043508.git.lstoakes@gmail.com
Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 895feb814620c2ae9c4e74aa95e3927f797316b0..1bddb151cd5c3866db50c4fede0382ca31a9f3b8 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3235,16 +3235,7 @@ extern int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
                      struct vm_area_struct *next);
 extern int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
                       unsigned long start, unsigned long end, pgoff_t pgoff);
-extern struct vm_area_struct *vma_merge(struct vma_iterator *vmi,
-       struct mm_struct *, struct vm_area_struct *prev, unsigned long addr,
-       unsigned long end, unsigned long vm_flags, struct anon_vma *,
-       struct file *, pgoff_t, struct mempolicy *, struct vm_userfaultfd_ctx,
-       struct anon_vma_name *);
 extern struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *);
-extern int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *,
-                      unsigned long addr, int new_below);
-extern int split_vma(struct vma_iterator *vmi, struct vm_area_struct *,
-                        unsigned long addr, int new_below);
 extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
 extern void unlink_file_vma(struct vm_area_struct *);
 extern struct vm_area_struct *copy_vma(struct vm_area_struct **,

diff --git a/mm/internal.h b/mm/internal.h
index d1f7a3c612fe59514975bc8522343197daef3ded..2ab81c68be6ceef817d7ffa2cdbc342715c5f398 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1002,6 +1002,15 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
                                   unsigned long addr, pmd_t *pmd,
                                   unsigned int flags);
 
+/*
+ * mm/mmap.c
+ */
+struct vm_area_struct *vma_merge(struct vma_iterator *vmi,
+       struct mm_struct *, struct vm_area_struct *prev, unsigned long addr,
+       unsigned long end, unsigned long vm_flags, struct anon_vma *,
+       struct file *, pgoff_t, struct mempolicy *, struct vm_userfaultfd_ctx,
+       struct anon_vma_name *);
+
 enum {
        /* mark page accessed */
        FOLL_TOUCH = 1 << 16,

diff --git a/mm/mmap.c b/mm/mmap.c
index bca685820763b2941268add919c1d1ba53fc3cde..a516f2412f79739ee2c22863d3214f474b656aef 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2346,8 +2346,8 @@ static void unmap_region(struct mm_struct *mm, struct ma_state *mas,
  * has already been checked or doesn't make sense to fail.
  * VMA Iterator will point to the end VMA.
  */
-int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
-               unsigned long addr, int new_below)
+static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
+                      unsigned long addr, int new_below)
 {
        struct vma_prepare vp;
        struct vm_area_struct *new;
@@ -2428,8 +2428,8 @@ out_free_vma:
  * Split a vma into two pieces at address 'addr', a new vma is allocated
  * either for the first part or the tail.
  */
-int split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
-             unsigned long addr, int new_below)
+static int split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
+                    unsigned long addr, int new_below)
 {
        if (vma->vm_mm->map_count >= sysctl_max_map_count)
                return -ENOMEM;

diff --git a/mm/nommu.c b/mm/nommu.c
index f9553579389bfc3931e892d6813508813d8e5d74..fc4afe924ad5ff58f50a540f91a1a79d999c2d53 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1305,8 +1305,8 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
  * split a vma into two pieces at address 'addr', a new vma is allocated either
  * for the first part or the tail.
  */
-int split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
-             unsigned long addr, int new_below)
+static int split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
+                    unsigned long addr, int new_below)
 {
        struct vm_area_struct *new;
        struct vm_region *region;