Skip to contentSkip to conversation

mm-hugetlb-use-hugetlb_pte_stable-in-migration-race-check.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 12, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/hugetlb: use hugetlb_pte_stable in migration race check
has been removed from the -mm tree. Its filename was
mm-hugetlb-use-hugetlb_pte_stable-in-migration-race-check.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/hugetlb: use hugetlb_pte_stable in migration race check
Date: Tue, 4 Oct 2022 15:33:59 -0400

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

---

 mm/hugetlb.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-use-hugetlb_pte_stable-in-migration-race-check +3 -4
@@ -5634,11 +5634,10 @@ static vm_fault_t hugetlb_no_page(struct
 			 * 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));

_

Patches currently in -mm which might be from [email protected] are

mm-selftest-uffd-explain-the-write-missing-fault-check.patch