From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063622; b=SXVJ6SRImXMzFBnBt7NF1f1De7rpQejQSn+S9I3WLpshtVZ1ccdBtq+RHyBW79k5r425 bDqUIuDSbSbJwpdUZc/0Vm4qivkT1A56FJYg4dffaovj44M76yxr40M2Zi6f0SsW4V4Az l8WWMagM1tu4jHVJaxSeGMtL4ESQF9gSpbMZbkA2edMUjGJVsk393/6KCX/Kby+yBLVCK i4vXqdCi8lN0AvqOdKL2Au4qY4xvC/DHP5a806ziW5eOcviBYkpyILmdYdu1xE/jyfL9T JGnJ6HhgCMsvVqjyntXrzewOjojGTXAKX4UIKJEpRn2aRqWH0DbIvSfhcjzP9PDLYbA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063622; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=yquqyf/pnD/fPIsS5n3tAaF3jJeHCz73NtlsnH2pr9E=; b=VThjhWUbGPIWj5SLs/0yh21QJKwGQn9Hq1jNTwYc5nUvfB/kdOvKv+0gJSg28uSytOG2 KlA3UriBKo084NAJCT3TM93VlUf9J7rmXHeWWvwsn10holhoiwhmeCo1mZWS3uJHUPGkA 2SlRkpBjk2lnEVp/Pyex+f6kc6Sqc1RCSSR5XZUaV085RpASo3F7wqvS+zWIu4yoltC6O NopYTzGcCUY4Ui3mROsA6zZvdPRmcRV1iDAD33yvIY4/L22+PpduJZuY+iYnEDoAR/r35 FKqRMOoXQ4zDDPt2jF5XaRSFJgxLqEnWFahEiyWTJ6l53+pY3UQYmQhChMXEOIwqM2Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=G6QQhdFP; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F0BA6082BE9; Sat, 7 Nov 2026 15:00:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=G6QQhdFP Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFB271F0089F; Sat, 7 Nov 2026 15:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063622; bh=yquqyf/pnD/fPIsS5n3tAaF3jJeHCz73NtlsnH2pr9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G6QQhdFP2gfKsiaVIy6SK24DU7CXdIiV4J9OTlRjU0fXSUMrHCuQNMFwVcl+cRBRI sfEHaPbE9a/ApkVLJkoUtnF57JbQjMOftBhyCbnt8t2tSkqiFJivtXLyxYjz3KdRoa 8AYPNZ7iwKGifUKSIdt7S80bjPS3CPuNlEOQI3S4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , "David Hildenbrand (Arm)" , Andrew Morton , Chris Mason , "Lorenzo Stoakes (ARM)" , Muchun Song , Lance Yang , "Liam R. Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Oscar Salvador , Miaohe Lin , Naoya Horiguchi , Adam Litke , Mel Gorman , Rik van Riel , Peter Xu , Kiryl Shutsemau , Mike Rapoport , Sasha Levin Subject: [PATCH 6.18 741/869] mm/hugetlb: dont clear the resv_map of a VMA whose lock is held Date: Sat, 7 Nov 2026 08:57:03 -0500 Message-ID: <20261107134917.937679998@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit d42032c0fe3ca007986c1229128775af0340fbec ] Since commit bf4916922c60 ("hugetlbfs: extend hugetlb_vma_lock to private VMAs") the lock of a private hugetlb VMA that owns a reservation is the rw_sema of its resv_map. The hugetlb_vma_*lock*() helpers find it through vma->vm_private_data, anew for every lock and every unlock. At the end of mremap() the old VMA has to let go of the resv_map, which now belongs to the new VMA: clear_vma_resv_huge_pages() stores NULL into vm_private_data. mremap() holds mmap_lock for writing and has write locked the VMA, which keeps away everybody who comes through the mm. It does not keep away those who find the VMA through the file. For hole punch and truncation hugetlb_vmdelete_list() does hugetlb_vma_trylock_write(vma); locks resv_map->rw_sema unmap_hugepage_range(vma, ...); vm_private_data = NULL hugetlb_vma_unlock_write(vma); no resv_map: does nothing and the rw_sema stays write locked for ever: WARNING: lock held when returning to user space! mremap_punch/116 is leaving the kernel with locks still held! locks held by mremap_punch/116: 1, last CPU#1: #0: (&resv_map->rw_sema){+.+.}-{4:4}, at: hugetlb_vmdelete_list+0x46/0x160 The next fault in the new VMA sleeps in hugetlb_vma_lock_read(), uninterruptibly, and it holds its entry of hugetlb_fault_mutex_table[]. That table is global, so a fault of any other process on a page that hashes to the same entry sleeps uninterruptibly as well. All those who take the lock of a private VMA without taking the mmap/vma lock are affected: rmap walks. So hold i_mmap_rwsem around the clearing of the resv_map. No change of behaviour, other than that mremap() of a hugetlb VMA takes i_mmap_rwsem once more. Original fix generated by an LLM and sent in private by Josef. [david: avoid local variable, move and refine comment, description cleanups+simplifications] Link: https://lore.kernel.org/20261015-urgent_fixes-v1-5-42796911043b@kernel.org Fixes: bf4916922c60 ("hugetlbfs: extend hugetlb_vma_lock to private VMAs") Signed-off-by: Josef Bacik Signed-off-by: David Hildenbrand (Arm) Signed-off-by: Andrew Morton Reported-by: Chris Mason Reviewed-by: Lorenzo Stoakes (ARM) Acked-by: Muchun Song Reviewed-by: Lance Yang Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Jann Horn Cc: Pedro Falcato Cc: Oscar Salvador Cc: Miaohe Lin Cc: Naoya Horiguchi Cc: Adam Litke Cc: Mel Gorman Cc: Rik van Riel Cc: Peter Xu Cc: Kiryl Shutsemau Cc: Mike Rapoport Cc: Signed-off-by: Sasha Levin --- mm/hugetlb.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8832923dfbcd8..ed4fb48cb35b8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -8054,6 +8054,15 @@ void hugetlb_unshare_all_pmds(struct vm_area_struct *vma) */ void fixup_hugetlb_reservations(struct vm_area_struct *vma) { - if (is_vm_hugetlb_page(vma)) - clear_vma_resv_huge_pages(vma); + if (!is_vm_hugetlb_page(vma)) + return; + + /* + * Rmap walks might still find this VMA and take the lock + * inside the reservation map for __vma_private_lock(). Don't clear + * the reservation map while that is possible. + */ + i_mmap_lock_write(vma->vm_file->f_mapping); + clear_vma_resv_huge_pages(vma); + i_mmap_unlock_write(vma->vm_file->f_mapping); } -- 2.53.0