The patch titled Subject: hugetlb: allow faults to be handled under the VMA lock has been added to the -mm mm-unstable branch. Its filename is hugetlb-allow-faults-to-be-handled-under-the-vma-lock.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/hugetlb-allow-faults-to-be-handled-under-the-vma-lock.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Vishal Moola (Oracle)" <vishal.moola@xxxxxxxxx> 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. Link: https://lkml.kernel.org/r/20240221234732.187629-6-vishal.moola@xxxxxxxxx Signed-off-by: Vishal Moola (Oracle) <vishal.moola@xxxxxxxxx> Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Muchun Song <muchun.song@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 6 ------ 1 file changed, 6 deletions(-) --- a/mm/hugetlb.c~hugetlb-allow-faults-to-be-handled-under-the-vma-lock +++ a/mm/hugetlb.c @@ -6466,12 +6466,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 vishal.moola@xxxxxxxxx are mm-memory-change-vmf_anon_prepare-to-be-non-static.patch hugetlb-move-vm_struct-declaration-to-the-top-of-hugetlb_fault.patch hugetlb-pass-struct-vm_fault-through-to-hugetlb_handle_userfault.patch hugetlb-use-vmf_anon_prepare-instead-of-anon_vma_prepare.patch hugetlb-allow-faults-to-be-handled-under-the-vma-lock.patch