Skip to content
This repository was archived by the owner on Oct 30, 2021. It is now read-only.

Commit 21205bf

Browse files
mjkravetztorvalds
authored andcommitted
userfaultfd: hugetlbfs: reserve count on error in __mcopy_atomic_hugetlb
If __mcopy_atomic_hugetlb exits with an error, put_page will be called if a huge page was allocated and needs to be freed. If a reservation was associated with the huge page, the PagePrivate flag will be set. Clear PagePrivate before calling put_page/free_huge_page so that the global reservation count is not incremented. Link: http://lkml.kernel.org/r/20161216144821.5183-26-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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 87ffc11 commit 21205bf

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

mm/userfaultfd.c

+16-1
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,23 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm,
301301
out_unlock:
302302
up_read(&dst_mm->mmap_sem);
303303
out:
304-
if (page)
304+
if (page) {
305+
/*
306+
* We encountered an error and are about to free a newly
307+
* allocated huge page. It is possible that there was a
308+
* reservation associated with the page that has been
309+
* consumed. See the routine restore_reserve_on_error
310+
* for details. Unfortunately, we can not call
311+
* restore_reserve_on_error now as it would require holding
312+
* mmap_sem. Clear the PagePrivate flag so that the global
313+
* reserve count will not be incremented in free_huge_page.
314+
* The reservation map will still indicate the reservation
315+
* was consumed and possibly prevent later page allocation.
316+
* This is better than leaking a global reservation.
317+
*/
318+
ClearPagePrivate(page);
305319
put_page(page);
320+
}
306321
BUG_ON(copied < 0);
307322
BUG_ON(err > 0);
308323
BUG_ON(!copied && !err);

0 commit comments

Comments
 (0)