Commit 82c5a8c0 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Greg Kroah-Hartman

userfaultfd: use ENOENT instead of EFAULT if the atomic copy user fails

commit 9e368259 upstream.

Patch series "userfaultfd shmem updates".

Jann found two bugs in the userfaultfd shmem MAP_SHARED backend: the
lack of the VM_MAYWRITE check and the lack of i_size checks.

Then looking into the above we also fixed the MAP_PRIVATE case.

Hugh by source review also found a data loss source if UFFDIO_COPY is
used on shmem MAP_SHARED PROT_READ mappings (the production usages
incidentally run with PROT_READ|PROT_WRITE, so the data loss couldn't
happen in those production usages like with QEMU).

The whole patchset is marked for stable.

We verified QEMU postcopy live migration with guest running on shmem
MAP_PRIVATE run as well as before after the fix of shmem MAP_PRIVATE.
Regardless if it's shmem or hugetlbfs or MAP_PRIVATE or MAP_SHARED, QEMU
unconditionally invokes a punch hole if the guest mapping is filebacked
and a MADV_DONTNEED too (needed to get rid of the MAP_PRIVATE COWs and
for the anon backend).

This patch (of 5):

We internally used EFAULT to communicate with the caller, switch to
ENOENT, so EFAULT can be used as a non internal retval.

Link: http://lkml.kernel.org/r/20181126173452.26955-2-aarcange@redhat.com
Fixes: 4c27fe4c ("userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support")
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Reviewed-by: default avatarHugh Dickins <hughd@google.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Jann Horn <jannh@google.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: <stable@vger.kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a88a1b3c
...@@ -4037,7 +4037,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, ...@@ -4037,7 +4037,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
/* fallback to copy_from_user outside mmap_sem */ /* fallback to copy_from_user outside mmap_sem */
if (unlikely(ret)) { if (unlikely(ret)) {
ret = -EFAULT; ret = -ENOENT;
*pagep = page; *pagep = page;
/* don't free the page */ /* don't free the page */
goto out; goto out;
......
...@@ -2266,7 +2266,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, ...@@ -2266,7 +2266,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,
*pagep = page; *pagep = page;
shmem_inode_unacct_blocks(inode, 1); shmem_inode_unacct_blocks(inode, 1);
/* don't free the page */ /* don't free the page */
return -EFAULT; return -ENOENT;
} }
} else { /* mfill_zeropage_atomic */ } else { /* mfill_zeropage_atomic */
clear_highpage(page); clear_highpage(page);
......
...@@ -49,7 +49,7 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, ...@@ -49,7 +49,7 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm,
/* fallback to copy_from_user outside mmap_sem */ /* fallback to copy_from_user outside mmap_sem */
if (unlikely(ret)) { if (unlikely(ret)) {
ret = -EFAULT; ret = -ENOENT;
*pagep = page; *pagep = page;
/* don't free the page */ /* don't free the page */
goto out; goto out;
...@@ -275,7 +275,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, ...@@ -275,7 +275,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm,
cond_resched(); cond_resched();
if (unlikely(err == -EFAULT)) { if (unlikely(err == -ENOENT)) {
up_read(&dst_mm->mmap_sem); up_read(&dst_mm->mmap_sem);
BUG_ON(!page); BUG_ON(!page);
...@@ -521,7 +521,7 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm, ...@@ -521,7 +521,7 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm,
src_addr, &page, zeropage); src_addr, &page, zeropage);
cond_resched(); cond_resched();
if (unlikely(err == -EFAULT)) { if (unlikely(err == -ENOENT)) {
void *page_kaddr; void *page_kaddr;
up_read(&dst_mm->mmap_sem); up_read(&dst_mm->mmap_sem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment