Commit a5bb8669 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

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: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarDavid Hildenbrand (Red Hat) <david@kernel.org>
Reviewed-by: default avatarLiam 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f5f035a7

include/linux/userfaultfd_k.h

+2 −33
Original line number Diff line number Diff line
@@ -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)

{

mm/userfaultfd.c

+33 −0
Original line number Diff line number Diff line
@@ -2018,6 +2018,39 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, unsigned long dst_start, 
	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)

{