]> www.infradead.org Git - users/jedix/linux-maple.git/commit
userfaultfd: hugetlbfs: fix __mcopy_atomic_hugetlb retry/error processing
authorMike Kravetz <mike.kravetz@oracle.com>
Thu, 12 Jan 2017 01:19:15 +0000 (12:19 +1100)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 18:55:48 +0000 (13:55 -0500)
commitbd0a437c4e3fee8e751a6056fd1de383925de6b3
treede59764bd2f0b8637bbd3c9432befddaa5131643
parent0ab11589231bf004c2d7c5836d22ee220f75fea3
userfaultfd: hugetlbfs: fix __mcopy_atomic_hugetlb retry/error processing

Orabug: 21685254

The new routine copy_huge_page_from_user() uses kmap_atomic() to map
PAGE_SIZE pages.  However, this prevents page faults in the subsequent
call to copy_from_user().  This is OK in the case where the routine is
copied with mmap_sema held.  However, in another case we want to allow
page faults.  So, add a new argument allow_pagefault to indicate if the
routine should allow page faults.

Link: http://lkml.kernel.org/r/20161216144821.5183-20-aarcange@redhat.com
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Michael Rapoport <RAPOPORT@il.ibm.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from linux-next next-20170117
 commit 939d5ff6c4e48f72b3261baf8d4b82f54caf4561)
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
include/linux/mm.h
mm/hugetlb.c
mm/memory.c
mm/userfaultfd.c