Commit 4fb07ee6 authored Nov 30, 2019 by Wei Yang Committed by Linus Torvalds Dec 01, 2019

userfaultfd: use vma_pagesize for all huge page size calculation

In __mcopy_atomic_hugetlb() we use two variables to deal with huge page
size: vma_hpagesize and huge_page_size.

Since they are the same, it is not necessary to use two different
mechanism. This patch makes it consistent by all using vma_hpagesize.

Link: http://lkml.kernel.org/r/20190927070032.2129-1-richardw.yang@linux.intel.com


Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent df6c6500

mm/userfaultfd.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ retry:
		pte_t dst_pteval;

		BUG_ON(dst_addr >= dst_start + len);
		VM_BUG_ON(dst_addr & ~huge_page_mask(h));
		VM_BUG_ON(dst_addr & (vma_hpagesize - 1));

		/*
		* Serialize via hugetlb_fault_mutex
		@@ -270,7 +270,7 @@ retry:
		mutex_lock(&hugetlb_fault_mutex_table[hash]);

		err = -ENOMEM;
		dst_pte = huge_pte_alloc(dst_mm, dst_addr, huge_page_size(h));
		dst_pte = huge_pte_alloc(dst_mm, dst_addr, vma_hpagesize);
		if (!dst_pte) {
		mutex_unlock(&hugetlb_fault_mutex_table[hash]);
		goto out_unlock;
		@@ -297,7 +297,8 @@ retry:

		err = copy_huge_page_from_user(page,
		(const void __user *)src_addr,
		pages_per_huge_page(h), true);
		vma_hpagesize / PAGE_SIZE,
		true);
		if (unlikely(err)) {
		err = -EFAULT;
		goto out;

Admin message