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=1795054412; b=X6i7ILMs/kHCPRiW2HVdAsIYG36b/fi6VGIs+WqLg+p49/MvFdRPyhtjCwtOlPT+KT3X e3iL3CPmJtr3WYod/T1yfKNpv1yxLwwpKEYaPN40XngSsKN+eDLf4TKyhWf/RHWf29W+i cBTZ12vx3vfhnH5aDXzeeYRkLvYwJyB2TquaWoxwuVUlNPXChOUE66c7CJrIOpCmgApxk 4uccT5gI9uFAMafVQnGg/hs7s51M9lwrpqlGMBfeFft2teMahkCOhfWinBPlSGnJN6sJV wAZPd+AL80eYvWnZ9pjXbDap1Jh+yjX+dwIWbS3zDto21oJ+FatiRYSqe2rCWaDsCqA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054412; 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=sNut3CWd2pjOR07Bn4Fd70ra5cdt0JWdVleNKuBUYfo=; b=LVBh6z70vXb45KcLEUBz78W3a0TsK9kTBjvwa+LY40hZ+eSZPfOg2UDNHagq536x+UKh cV3whT8Svj3PwbCBLUVEGVecS9qxDxgWeH2xyaKMzAmeW9XHFjp+HBnhGsIFwuIze6wkc nWFcfgY1TMkcjiNm8fTk4KajJZCwFoEH4aKkfIKrRIIaaV0TND2S3xb1TtFuOYnGnKheP WAjRjOyA1FD253v4rrCnCb/lZyYlgUX1sinwq3/svFuwvqN9nsk3A+9AR+cieQHG9YASH /tLktW97ox2a11/WLSlNFsA+OxdePyafQGnjEWdkLvNHxZ6qbBXN+Tu5nSxFBbkvFMA== 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=yaJ+LsRV; 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 DAE20606A332; Thu, 19 Nov 2026 02:13:32 +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=yaJ+LsRV Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE6D01F000C4; Thu, 19 Nov 2026 02:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054412; bh=sNut3CWd2pjOR07Bn4Fd70ra5cdt0JWdVleNKuBUYfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yaJ+LsRVW11+eHs6u2fUyxJVJv2MBB0saDVgbYR4UQh52BSh/dGueZChp7PQ/R6zY oRxu3gUD5KwVsbw600MqT2OUHK98vWeWkVt1ZEkX2F1RY/7wU1oWXXPSNV67M4xO8C 0YgD2dhLOtjrjzlTFd0Lku/whh+LzTWZiOx8rmWs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chris Mason , "Gregory Price (Meta)" , Muhammad Usama Anjum , Zi Yan , Baolin Wang , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 5.15 1265/2214] mm/huge_memory: fix truncate racing with PMD zapping Date: Wed, 18 Nov 2026 15:49:01 +0100 Message-ID: <20261118150102.233418658@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Mason [ Upstream commit e6a07d29b0a60f3a4cfe77fe34eeb4b3fb38d6c4 ] zap_huge_pmd_folio() removes the rmap before calling folio_mark_dirty(). If this was the last mapping, truncation can skip unmapping the folio and proceed without waiting for the PMD lock, racing with dirtying. ifs_set_range_dirty() can oops if MADV_DONTNEED races with ftruncate() on XFS, when we get the folio set dirty after it was found to not be mapped anymore. Move folio_mark_dirty() and folio_mark_accessed() before rmap removal, matching the PTE zap path. This keeps the folio mapped while updating its state, so truncation must wait for the page table lock. Fix generated by an LLM and sent by Chris Mason in private. Fixes: fe6cf984939d ("mm/huge_memory: transfer the pmd dirty bit to the folio on zap") Cc: stable@vger.kernel.org Signed-off-by: Chris Mason [ david: simplify comment and description ] Reviewed-by: Gregory Price (Meta) Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-13-d6437171ecc3@kernel.org Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Signed-off-by: David Hildenbrand (Arm) [ sashal: adapted zap_huge_pmd_folio() changes to the page-based implementation in zap_huge_pmd() ] Signed-off-by: Sasha Levin --- mm/huge_memory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index cd44744724d0a..1cfc6c8156e18 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1622,8 +1622,6 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, if (pmd_present(orig_pmd)) { page = pmd_page(orig_pmd); - page_remove_rmap(page, true); - VM_BUG_ON_PAGE(page_mapcount(page) < 0, page); VM_BUG_ON_PAGE(!PageHead(page), page); } else if (thp_migration_supported()) { swp_entry_t entry; @@ -1647,6 +1645,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, set_page_dirty(page); } + /* Remove the rmap after transferring the dirty bit to the page. */ + if (pmd_present(orig_pmd)) { + page_remove_rmap(page, true); + VM_BUG_ON_PAGE(page_mapcount(page) < 0, page); + } + spin_unlock(ptl); if (flush_needed) tlb_remove_page_size(tlb, page, HPAGE_PMD_SIZE); -- 2.53.0