Skip to contentSkip to conversation

hugetlb-allow-faults-to-be-handled-under-the-vma-lock.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 5, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: hugetlb: allow faults to be handled under the VMA lock
has been removed from the -mm tree. Its filename was
hugetlb-allow-faults-to-be-handled-under-the-vma-lock.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: "Vishal Moola (Oracle)" <[email protected]>
Subject: hugetlb: allow faults to be handled under the VMA lock
Date: Wed, 21 Feb 2024 15:47:32 -0800

Hugetlb can now safely handle faults under the VMA lock, so allow it to do so.

This patch may cause ltp hugemmap10 to "fail". Hugemmap10 tests hugetlb counters, and expects the counters to remain unchanged on failure to handle a fault.

In hugetlb_no_page(), vmf_anon_prepare() may bailout with no anon_vma under the VMA lock after allocating a folio for the hugepage. In free_huge_folio(), this folio is completely freed on bailout iff there is a surplus of hugetlb pages. This will remove a folio off the freelist and decrement the number of hugepages while ltp expects these counters to remain unchanged on failure.

Originally this could only happen due to OOM failures, but now it may also occur after we allocate a hugetlb folio without a suitable anon_vma under the VMA lock. This should only happen for the first freshly allocated hugepage in this vma.

---

 mm/hugetlb.c |    6 ------
 1 file changed, 6 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~hugetlb-allow-faults-to-be-handled-under-the-vma-lock +0 -6
@@ -6379,12 +6379,6 @@ vm_fault_t hugetlb_fault(struct mm_struc
 		 */
 	};
 
-	/* TODO: Handle faults under the VMA lock */
-	if (flags & FAULT_FLAG_VMA_LOCK) {
-		vma_end_read(vma);
-		return VM_FAULT_RETRY;
-	}
-
 	/*
 	 * Serialize hugepage allocation and instantiation, so that we don't
 	 * get spurious allocation failures if two CPUs race to instantiate

_

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