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=1795022433; b=emuGhJbtsy/PboeYfwKJ1ah71nvlbZG24diiv/LoogtF7dtmzgiC0e7fikGFfFBuXXwX 1v/ea+xFvzaaFYGh9F7ov/MGVd4Gn+LojwzJhdlPI/5vYaj+LSKZFg2ba3n5DlU1mWIM/ 4WUILzFKKFZ7I6e8Ckr8u72wvheCrE2bXC/TzorF1bKzbY80LSzUgYb/7Kg/qIwyXVpyz CSz4wOgU3VEjYkS4ie5W2/rixDZcg4ywHRMseUG8K7lRhr8KgCfcUg5EYUknYfOfvFwTh GOe1Y7BwdxlAQWsSv/Tmp+fL2QdVoWGVysW78hchS7H6cBEIdeQKavVeY1BoD51qZiQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022433; 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=U7VyXgEY+5p6QR64NoiA5ggvq2g+6QDnvCZSNAEsgXM=; b=sVpe+3LsTbyuvAXgPCy/C/RUPwPcBo9Qptrht1jyJoW8Q1Dyg8+wNfeZTWSg736fE4fB 6sIELML5Syj13fDgzvYaFXGq6416GmKdXKXOZ4NiAatlo4qUB/j5SfBA66TdRi4jbPGsg ValmZXGu5ZdW9qRbixs5M0kuj83gydOp9sArKkpqi43WnYJnm1A/zudd4YLa0f24eiujb Oaj1XIHQje3+NhKDGOXTLev13Zf9m1hBHeTvllf8rTE8ReCe95sr1CYHo0ImGmUD/5q1k UO4CqrxCShhBamQ+21ddNleDJixT9oj+nC1aEA9+PWRgSjDDhJkYad9YJWkt9lCKaxA== 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="a/ApDFVz"; 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 CC3A1606A31C; Wed, 18 Nov 2026 17:20:33 +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=a/ApDFVz Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4D2B1F000C4; Wed, 18 Nov 2026 17:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022433; bh=U7VyXgEY+5p6QR64NoiA5ggvq2g+6QDnvCZSNAEsgXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a/ApDFVzJdaTSPEu6P5SottSoccLA0nk72QxI6ZGJHX/EO0E1GKgnMpNxE7pe1Llh xGER+mIz9tROtfkiJPIGxg9aavmlzMM4sEvbVArlcrT28kfuDU01nYfp+HDDmxH5st zz5fUeclotCasT/yMUbxJnoqcbi/xWOR0xIq3pSo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , "David Hildenbrand (Arm)" , "Mike Rapoport (Microsoft)" , Andrew Morton , Chris Mason , "Lorenzo Stoakes (ARM)" , Lance Yang , "Liam R. Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Muchun Song , Oscar Salvador , Miaohe Lin , Naoya Horiguchi , Adam Litke , Mel Gorman , Rik van Riel , Peter Xu , Kiryl Shutsemau , Sasha Levin Subject: [PATCH 6.18 0004/2151] mm/hugetlb: fix endless write fault on a leftover uffd bit Date: Wed, 18 Nov 2026 15:28:59 +0100 Message-ID: <20261118150121.795360355@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev 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 f61e1cf15fb44f9cf89d43d8ef01f926322bb1c4 ] hugetlb_fault() resolves the uffd bit on a write fault only if the VMA is registered for userfaultfd write protection, and hugetlb_wp() bails out for any entry with the uffd bit set assuming hugetlb_fault() has already resolved it. When a read-only hugetlb entry with the uffd bit set is mapped in a VMA that is not registered for uffd-wp, a write fault to it never makes progress. If the access comes from the kernel, e.g. read(2) from /dev/zero into such page, the task spins in the page fault handler, ignores SIGKILL and keeps holding the locks taken by the system call. Such entries should not exist, but an unprivileged user can create them, for example with MADV_DONTNEED of a page protected with UFFDIO_RWPROTECT or with UFFDIO_COPY in MODE_WP racing with UFFDIO_UNREGISTER. Clear the uffd bit when the VMA is not registered for uffd-wp and let the fault proceed to hugetlb_wp(), like do_wp_page() does for regular pages. Note that a FOLL_FORCE write to a page protected with UFFDIO_RWPROTECT in a private VMA that was made PROT_NONE now drops the RWP protection of that page. Original fix generated by an LLM and sent in private by Josef. [rppt@kernel.org: massage commit message] [david@kernel.org: convert comment into a TODO] Link: https://lore.kernel.org/20261015-urgent_fixes-v1-6-42796911043b@kernel.org Fixes: 60d5b473d61b ("mm/hugetlb: fix uffd wr-protection for CoW optimization path") Signed-off-by: Josef Bacik Signed-off-by: David Hildenbrand (Arm) Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Andrew Morton Reported-by: Chris Mason Acked-by: Lorenzo Stoakes (ARM) Reviewed-by: Lance Yang Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Jann Horn Cc: Pedro Falcato Cc: Muchun Song 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: [ sashal: retained the older huge_pte_uffd_wp() and huge_pte_clear_uffd_wp() helper names. ] Signed-off-by: Sasha Levin --- mm/hugetlb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a8da4cb7ad10f..32daea7b157fa 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6860,15 +6860,19 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, goto out_ptl; /* Handle userfault-wp first, before trying to lock more pages */ - if (userfaultfd_wp(vma) && huge_pte_uffd_wp(huge_ptep_get(mm, vmf.address, vmf.pte)) && + if (huge_pte_uffd_wp(huge_ptep_get(mm, vmf.address, vmf.pte)) && (flags & FAULT_FLAG_WRITE) && !huge_pte_write(vmf.orig_pte)) { - if (!userfaultfd_wp_async(vma)) { + if (userfaultfd_wp(vma) && !userfaultfd_wp_async(vma)) { spin_unlock(vmf.ptl); hugetlb_vma_unlock_read(vma); mutex_unlock(&hugetlb_fault_mutex_table[hash]); return handle_userfault(&vmf, VM_UFFD_WP); } + /* + * TODO: fix all cases where uffd PTE bits remain in VMAs that + * are no longer registered with uffd. + */ vmf.orig_pte = huge_pte_clear_uffd_wp(vmf.orig_pte); set_huge_pte_at(mm, vmf.address, vmf.pte, vmf.orig_pte, huge_page_size(hstate_vma(vma))); -- 2.53.0