hugetlbfs-skip-vmas-without-shareable-locks-in-hugetlb_vmdelete_list.patch removed from -mm tree
The quilt patch titled
Subject: hugetlbfs: skip VMAs without shareable locks in hugetlb_vmdelete_list
has been removed from the -mm tree. Its filename was
hugetlbfs-skip-vmas-without-shareable-locks-in-hugetlb_vmdelete_list.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: Deepanshu Kartikey <[email protected]>
Subject: hugetlbfs: skip VMAs without shareable locks in hugetlb_vmdelete_list
Date: Fri, 26 Sep 2025 09:02:54 +0530
hugetlb_vmdelete_list() uses trylock to acquire VMA locks during truncate operations. As per the original design in commit 40549ba8f8e0 ("hugetlb:
use new vma_lock for pmd sharing synchronization"), if the trylock fails or the VMA has no lock, it should skip that VMA. Any remaining mapped pages are handled by remove_inode_hugepages() which is called after hugetlb_vmdelete_list() and uses proper lock ordering to guarantee unmapping success.
Currently, when hugetlb_vma_trylock_write() returns success (1) for VMAs without shareable locks, the code proceeds to call unmap_hugepage_range(). This causes assertion failures in huge_pmd_unshare() → hugetlb_vma_assert_locked() because no lock is actually held:
WARNING: CPU: 1 PID: 6594 Comm: syz.0.28 Not tainted Call Trace: hugetlb_vma_assert_locked+0x1dd/0x250 huge_pmd_unshare+0x2c8/0x540 __unmap_hugepage_range+0x6e3/0x1aa0 unmap_hugepage_range+0x32e/0x410 hugetlb_vmdelete_list+0x189/0x1f0
Fix by using goto to ensure locks acquired by trylock are always released, even when skipping VMAs without shareable locks.
---
fs/hugetlbfs/inode.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~hugetlbfs-skip-vmas-without-shareable-locks-in-hugetlb_vmdelete_list +9 -0
@@ -478,6 +478,14 @@ 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);
@@ -488,6 +496,7 @@ 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); } }
_
Patches currently in -mm which might be from [email protected] are