userfaultfd: move vma_can_userfault out of line

vma_can_userfault() has grown pretty big and it's not called on
performance critical path.

Move it out of line.

No functional changes.

Link: https://lore.kernel.org/20260402041156.1377214-7-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: David Hildenbrand (Red Hat) <david@kernel.org>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andrei Vagin <avagin@google.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Harry Yoo <harry.yoo@oracle.com>
Cc: Harry Yoo (Oracle) <harry@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: James Houghton <jthoughton@google.com>
Cc: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nikita Kalyazin <kalyazin@amazon.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: David Carlier <devnexen@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h
index d83e349900a3205396c5bf0925b0f5a7ba88e4a4..ce0201c3dd822416e5837d899cfc139255a92503 100644 (file)
--- a/include/linux/userfaultfd_k.h
+++ b/include/linux/userfaultfd_k.h
@@ -211,39 +211,8 @@ static inline bool userfaultfd_armed(struct vm_area_struct *vma)
        return vma->vm_flags & __VM_UFFD_FLAGS;
 }
 
-static inline bool vma_can_userfault(struct vm_area_struct *vma,
-                                    vm_flags_t vm_flags,
-                                    bool wp_async)
-{
-       vm_flags &= __VM_UFFD_FLAGS;
-
-       if (vma->vm_flags & VM_DROPPABLE)
-               return false;
-
-       if ((vm_flags & VM_UFFD_MINOR) &&
-           (!is_vm_hugetlb_page(vma) && !vma_is_shmem(vma)))
-               return false;
-
-       /*
-        * If wp async enabled, and WP is the only mode enabled, allow any
-        * memory type.
-        */
-       if (wp_async && (vm_flags == VM_UFFD_WP))
-               return true;
-
-       /*
-        * If user requested uffd-wp but not enabled pte markers for
-        * uffd-wp, then shmem & hugetlbfs are not supported but only
-        * anonymous.
-        */
-       if (!uffd_supports_wp_marker() && (vm_flags & VM_UFFD_WP) &&
-           !vma_is_anonymous(vma))
-               return false;
-
-       /* By default, allow any of anon|shmem|hugetlb */
-       return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) ||
-           vma_is_shmem(vma);
-}
+bool vma_can_userfault(struct vm_area_struct *vma, vm_flags_t vm_flags,
+                      bool wp_async);
 
 static inline bool vma_has_uffd_without_event_remap(struct vm_area_struct *vma)
 {

diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index 4857be5a7fa209354646cc65d4d68a749d61fbae..ebdc6e24a2c70b40e02ffa98f950e6a8d633c30c 100644 (file)
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -2018,6 +2018,39 @@ out:
        return moved ? moved : err;
 }
 
+bool vma_can_userfault(struct vm_area_struct *vma, vm_flags_t vm_flags,
+                      bool wp_async)
+{
+       vm_flags &= __VM_UFFD_FLAGS;
+
+       if (vma->vm_flags & VM_DROPPABLE)
+               return false;
+
+       if ((vm_flags & VM_UFFD_MINOR) &&
+           (!is_vm_hugetlb_page(vma) && !vma_is_shmem(vma)))
+               return false;
+
+       /*
+        * If wp async enabled, and WP is the only mode enabled, allow any
+        * memory type.
+        */
+       if (wp_async && (vm_flags == VM_UFFD_WP))
+               return true;
+
+       /*
+        * If user requested uffd-wp but not enabled pte markers for
+        * uffd-wp, then shmem & hugetlbfs are not supported but only
+        * anonymous.
+        */
+       if (!uffd_supports_wp_marker() && (vm_flags & VM_UFFD_WP) &&
+           !vma_is_anonymous(vma))
+               return false;
+
+       /* By default, allow any of anon|shmem|hugetlb */
+       return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) ||
+           vma_is_shmem(vma);
+}
+
 static void userfaultfd_set_vm_flags(struct vm_area_struct *vma,
                                     vm_flags_t vm_flags)
 {