Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3217d3c7 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

userfaultfd: mcopy_atomic: introduce mfill_atomic_pte helper 

Shuffle the code a bit to improve readability.

Link: http://lkml.kernel.org/r/1497939652-16528-5-git-send-email-rppt@linux.vnet.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d103963

mm/userfaultfd.c

+30 −16
Original line number Diff line number Diff line
@@ -371,6 +371,34 @@ extern ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, 
				      bool zeropage);

#endif /* CONFIG_HUGETLB_PAGE */



static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm,

						pmd_t *dst_pmd,

						struct vm_area_struct *dst_vma,

						unsigned long dst_addr,

						unsigned long src_addr,

						struct page **page,

						bool zeropage)

{

	ssize_t err;



	if (vma_is_anonymous(dst_vma)) {

		if (!zeropage)

			err = mcopy_atomic_pte(dst_mm, dst_pmd, dst_vma,

					       dst_addr, src_addr, page);

		else

			err = mfill_zeropage_pte(dst_mm, dst_pmd,

						 dst_vma, dst_addr);

	} else {

		err = -EINVAL; /* if zeropage is true return -EINVAL */

		if (likely(!zeropage))

			err = shmem_mcopy_atomic_pte(dst_mm, dst_pmd,

						     dst_vma, dst_addr,

						     src_addr, page);

	}



	return err;

}



static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm,

					      unsigned long dst_start,

					      unsigned long src_start,
@@ -487,22 +515,8 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm, 
		BUG_ON(pmd_none(*dst_pmd));

		BUG_ON(pmd_trans_huge(*dst_pmd));



		if (vma_is_anonymous(dst_vma)) {

			if (!zeropage)

				err = mcopy_atomic_pte(dst_mm, dst_pmd, dst_vma,

						       dst_addr, src_addr,

						       &page);

			else

				err = mfill_zeropage_pte(dst_mm, dst_pmd,

							 dst_vma, dst_addr);

		} else {

			err = -EINVAL; /* if zeropage is true return -EINVAL */

			if (likely(!zeropage))

				err = shmem_mcopy_atomic_pte(dst_mm, dst_pmd,

							     dst_vma, dst_addr,

							     src_addr, &page);

		}



		err = mfill_atomic_pte(dst_mm, dst_pmd, dst_vma, dst_addr,

				       src_addr, &page, zeropage);

		cond_resched();



		if (unlikely(err == -EFAULT)) {