Commit f9bf6c03 authored by Peter Xu's avatar Peter Xu Committed by Andrew Morton
Browse files

mm/hugetlb: use hugetlb_pte_stable in migration race check 

After hugetlb_pte_stable() introduced, we can also rewrite the migration
race condition against page allocation to use the new helper too.

Link: https://lkml.kernel.org/r/20221004193400.110155-3-peterx@redhat.com


Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2ea7ff1e

mm/hugetlb.c

+3 −4
Original line number Diff line number Diff line
@@ -5634,11 +5634,10 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, 
			 * here.  Before returning error, get ptl and make

			 * sure there really is no pte entry.

			 */

			ptl = huge_pte_lock(h, mm, ptep);

			ret = 0;

			if (huge_pte_none(huge_ptep_get(ptep)))

			if (hugetlb_pte_stable(h, mm, ptep, old_pte))

				ret = vmf_error(PTR_ERR(page));

			spin_unlock(ptl);

			else

				ret = 0;

			goto out;

		}

		clear_huge_page(page, address, pages_per_huge_page(h));