hugetlbfs-move-lock-assertions-after-early-returns-in-huge_pmd_unshare.patch removed from -mm tree
The quilt patch titled
Subject: hugetlbfs: move lock assertions after early returns in huge_pmd_unshare()
has been removed from the -mm tree. Its filename was
hugetlbfs-move-lock-assertions-after-early-returns-in-huge_pmd_unshare.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Deepanshu Kartikey <[email protected]>
Subject: hugetlbfs: move lock assertions after early returns in huge_pmd_unshare()
Date: Tue, 14 Oct 2025 17:03:44 +0530
When hugetlb_vmdelete_list() processes VMAs during truncate operations, it may encounter VMAs where huge_pmd_unshare() is called without the required shareable lock. This triggers an assertion failure in hugetlb_vma_assert_locked().
The previous fix in commit dd83609b8898 ("hugetlbfs: skip VMAs without shareable locks in hugetlb_vmdelete_list") skipped entire VMAs without shareable locks to avoid the assertion. However, this prevented pages from being unmapped and freed, causing a regression in fallocate(PUNCH_HOLE) operations where pages were not freed immediately, as reported by Mark Brown.
Instead of checking locks in the caller or skipping VMAs, move the lock assertions in huge_pmd_unshare() to after the early return checks. The assertions are only needed when actual PMD unsharing work will be performed. If the function returns early because sz != PMD_SIZE or the PMD is not shared, no locks are required and assertions should not fire.
This approach reverts the VMA skipping logic from commit dd83609b8898 ("hugetlbfs: skip VMAs without shareable locks in hugetlb_vmdelete_list") while moving the assertions to avoid the assertion failure, keeping all the logic within huge_pmd_unshare() itself and allowing page unmapping and freeing to proceed for all VMAs.
---
fs/hugetlbfs/inode.c | 9 --------- mm/hugetlb.c | 5 ++--- 2 files changed, 2 insertions(+), 12 deletions(-)
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~hugetlbfs-move-lock-assertions-after-early-returns-in-huge_pmd_unshare +0 -9
@@ -478,14 +478,6 @@ hugetlb_vmdelete_list(struct rb_root_cacif (!hugetlb_vma_trylock_write (vma))continue ; -/* -* Skip VMAs without shareable locks. Per the design in commit -* 40549ba8f8e0, these will be handled by remove_inode_hugepages() -* called after this function with proper locking. -*/ -if (!__vma_shareable_lock (vma)) - goto skip; - v_start =vma_offset_start (vma, start); v_end =vma_offset_end (vma, end);
@@ -496,7 +488,6 @@ hugetlb_vmdelete_list(struct rb_root_cac* vmas. Therefore, lock is not held when calling * unmap_hugepage_range for private vmas. */ -skip:hugetlb_vma_unlock_write (vma); } }
mm/hugetlb.c renamed from mm/hugetlb.c~hugetlbfs-move-lock-assertions-after-early-returns-in-huge_pmd_unshare +2 -3
@@ -7614,13 +7614,12 @@ int huge_pmd_unshare(struct mm_struct *mp4d_t *p4d =p4d_offset (pgd, addr);pud_t *pud =pud_offset (p4d, addr); -i_mmap_assert_write_locked (vma->vm_file->f_mapping); -hugetlb_vma_assert_locked (vma);if (sz !=PMD_SIZE )return 0 ;if (!ptdesc_pmd_is_shared (virt_to_ptdesc (ptep)))return 0 ; - +i_mmap_assert_write_locked (vma->vm_file->f_mapping); +hugetlb_vma_assert_locked (vma);pud_clear (pud);/* * Once our caller drops the rmap lock, some other process might be
_
Patches currently in -mm which might be from [email protected] are