Commit 61c50040 authored by Axel Rasmussen's avatar Axel Rasmussen Committed by Andrew Morton
Browse files

mm: userfaultfd: don't pass around both mm and vma 

Quite a few userfaultfd functions took both mm and vma pointers as
arguments.  Since the mm is trivially accessible via vma->vm_mm, there's
no reason to pass both; it just needlessly extends the already long
argument list.

Get rid of the mm pointer, where possible, to shorten the argument list.

Link: https://lkml.kernel.org/r/20230314221250.682452-3-axelrasmussen@google.com


Signed-off-by: default avatarAxel Rasmussen <axelrasmussen@google.com>
Acked-by: default avatarPeter Xu <peterx@redhat.com>
Acked-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hugh Dickins <hughd@google.com>
Cc: James Houghton <jthoughton@google.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nadav Amit <namit@vmware.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a734991c

fs/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, 


		/* Reset ptes for the whole vma range if wr-protected */

		if (userfaultfd_wp(vma))

			uffd_wp_range(mm, vma, start, vma_end - start, false);

			uffd_wp_range(vma, start, vma_end - start, false);



		new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS;

		prev = vma_merge(&vmi, mm, prev, start, vma_end, new_flags,

include/linux/hugetlb.h

+2 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ unsigned long hugetlb_total_pages(void); 
vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,

			unsigned long address, unsigned int flags);

#ifdef CONFIG_USERFAULTFD

int hugetlb_mfill_atomic_pte(struct mm_struct *dst_mm, pte_t *dst_pte,

int hugetlb_mfill_atomic_pte(pte_t *dst_pte,

			     struct vm_area_struct *dst_vma,

			     unsigned long dst_addr,

			     unsigned long src_addr,
@@ -393,8 +393,7 @@ static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, 
}



#ifdef CONFIG_USERFAULTFD

static inline int hugetlb_mfill_atomic_pte(struct mm_struct *dst_mm,

					   pte_t *dst_pte,

static inline int hugetlb_mfill_atomic_pte(pte_t *dst_pte,

					   struct vm_area_struct *dst_vma,

					   unsigned long dst_addr,

					   unsigned long src_addr,

include/linux/shmem_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -152,14 +152,14 @@ extern void shmem_uncharge(struct inode *inode, long pages); 


#ifdef CONFIG_USERFAULTFD

#ifdef CONFIG_SHMEM

extern int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd,

extern int shmem_mfill_atomic_pte(pmd_t *dst_pmd,

				  struct vm_area_struct *dst_vma,

				  unsigned long dst_addr,

				  unsigned long src_addr,

				  bool zeropage, bool wp_copy,

				  struct page **pagep);

#else /* !CONFIG_SHMEM */

#define shmem_mfill_atomic_pte(dst_mm, dst_pmd, dst_vma, dst_addr, \

#define shmem_mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, \

			       src_addr, zeropage, wp_copy, pagep) ({ BUG(); 0; })

#endif /* CONFIG_SHMEM */

#endif /* CONFIG_USERFAULTFD */

include/linux/userfaultfd_k.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ enum mcopy_atomic_mode { 
	MCOPY_ATOMIC_CONTINUE,

};



extern int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd,

extern int mfill_atomic_install_pte(pmd_t *dst_pmd,

				    struct vm_area_struct *dst_vma,

				    unsigned long dst_addr, struct page *page,

				    bool newly_allocated, bool wp_copy);
@@ -73,7 +73,7 @@ extern ssize_t mfill_atomic_continue(struct mm_struct *dst_mm, unsigned long dst 
extern int mwriteprotect_range(struct mm_struct *dst_mm,

			       unsigned long start, unsigned long len,

			       bool enable_wp, atomic_t *mmap_changing);

extern long uffd_wp_range(struct mm_struct *dst_mm, struct vm_area_struct *vma,

extern long uffd_wp_range(struct vm_area_struct *vma,

			  unsigned long start, unsigned long len, bool enable_wp);



/* mm helpers */

mm/hugetlb.c

+2 −2
Original line number Diff line number Diff line
@@ -6159,8 +6159,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
 * Used by userfaultfd UFFDIO_* ioctls. Based on userfaultfd's mfill_atomic_pte

 * with modifications for hugetlb pages.

 */

int hugetlb_mfill_atomic_pte(struct mm_struct *dst_mm,

			     pte_t *dst_pte,

int hugetlb_mfill_atomic_pte(pte_t *dst_pte,

			     struct vm_area_struct *dst_vma,

			     unsigned long dst_addr,

			     unsigned long src_addr,
@@ -6168,6 +6167,7 @@ int hugetlb_mfill_atomic_pte(struct mm_struct *dst_mm, 
			     struct page **pagep,

			     bool wp_copy)

{

	struct mm_struct *dst_mm = dst_vma->vm_mm;

	bool is_continue = (mode == MCOPY_ATOMIC_CONTINUE);

	struct hstate *h = hstate_vma(dst_vma);

	struct address_space *mapping = dst_vma->vm_file->f_mapping;