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

Commit 8fb44e54 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

userfaultfd: shmem: wire up shmem_mfill_zeropage_pte 

For shmem VMAs we can use shmem_mfill_zeropage_pte for UFFDIO_ZEROPAGE

Link: http://lkml.kernel.org/r/1497939652-16528-6-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 3217d3c7

mm/userfaultfd.c

+4 −2
Original line number Diff line number Diff line
@@ -389,11 +389,13 @@ static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm, 
			err = mfill_zeropage_pte(dst_mm, dst_pmd,

						 dst_vma, dst_addr);

	} else {

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

		if (likely(!zeropage))

		if (!zeropage)

			err = shmem_mcopy_atomic_pte(dst_mm, dst_pmd,

						     dst_vma, dst_addr,

						     src_addr, page);

		else

			err = shmem_mfill_zeropage_pte(dst_mm, dst_pmd,

						       dst_vma, dst_addr);

	}



	return err;