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=1794796333; b=vkABFK4Q/+08jpsz5f+tEE3VVb9pHjuLMXtIC2gOgQ4ADhrZkzbRKTjni4yUed+bdcjO vKBCEPJh5NwF+0C7sQjaO0ISp+xwOEgf9FpGmVmOaq3oXqQfDEf6wbLzh0fvaf8a7IBpq mziZDOi9R9lnKILhCJaHoHWnaxjDV40ch13O1DQuZUSqAwgbcfFtNbmcwz8IQUkCPRfVo BUE5suT3yCApjsKy5yy1bMTtDv1WeZEz04tZwaqM3IGeKeCPncsSMunSd3bmZqyr/cPWs /kU8EUdg5jdpnMd2tVVjKb1khKgP/yucIasux6kNxvPZn/ayBDyQNxFcvUXKyDuf0RQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794796333; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=W+QCIZRWg9kFJ2URx9kmsSFbnXBuG1If3ZeECSfRCJk=; b=tQi+fXZsKh4Yv+2hbTkQrttjVqoW4VwFUncb1i0DrszSSE2R3Gs/fxyEiKXHtwL6oza8 74K3LuV4CJ4rvTSpTys43dELDvMtzHHZvfKCXStRrMUFzEgBRxTGNH2emUGDlahdIGa8L acJKwSj0/fXDivX/4U6FmpLdb1NWD9LNXZNRO1pOaiL7W6NX3FOmUpdbxNUmryyy9MmO6 SzpCko2t00S0Hng1UTdAaydi8hs3x3zmaJOBsqhS1hOHN/ErMuU0Xn/awNApAbsNquFAQ +/GCj8+iWq4sk8Zu2iOihkfaTp/bKhfApFVn16ShYJ9Yg08bML4DlmTh9jsu9gJDbQQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=jvB08mYU; 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 56F7D606A32C for ; Mon, 16 Nov 2026 02:32:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=jvB08mYU Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8D281F000C4; Mon, 16 Nov 2026 02:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794796332; bh=W+QCIZRWg9kFJ2URx9kmsSFbnXBuG1If3ZeECSfRCJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jvB08mYUmEMQ3wMQNmZzJwNCONezOONEw2Z2lbVWfyqZJDnvBJWOs2+WtY7Ho++15 h6yfTlsQq8aljmWADtEBeQfPTJ9yoQ9KV003wlZHsa0ebuzJtlf0J5KCSGWjsXcXce SY7SOowWA04EOO5ztuSbi5cptz05BPW3OFU+tDPZBDQZHxAyyozh6ajVF/OFb7th2r c25Swj1JsiHihmstEkdlC/rcQbHVx8YHrIb1g/t3PnBNug53zfbf3cSzqD9vV13S7J 1YPFpEkjVL8xMNTxYjMnXUpzBsPkQGo6SFnfKk5/QkzDi524wBaONP5Ze3cSs5/qQl UqXNjLsYgxXJg== From: Sasha Levin To: stable@vger.kernel.org Cc: Chris Mason , Pedro Falcato , "Gregory Price (Meta)" , Muhammad Usama Anjum , Lance Yang , Baolin Wang , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 5.15.y] mm/khugepaged: preserve dirty bits when collapsing PTE-mapped THPs Date: Sun, 15 Nov 2026 21:32:10 -0500 Message-ID: <20261116023141.2370512-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109202315-failed-5.15-fe2817e3d5ea@kernel.org> References: <20261109202315-failed-5.15-fe2817e3d5ea@kernel.org> 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 From: Chris Mason [ Upstream commit fe2817e3d5ea347214342c9a5cd8bcbff20c0574 ] try_collapse_pte_mapped_thp() clears PTEs without transferring their dirty bits to the folio. A shmem read fault can map a clean folio writable, so a later store only dirties the PTE. Losing that dirty bit allows reclaim to discard modified data. The assumption that regular files are read-only is also obsolete since commit 1b6444331bebb ("mm/khugepaged: enable clean pagecache folio collapse for writable files"). In any case, transferring PTE dirty bits to the folio when removing mappings (and while the folio is still mapped) is the right thing to do. Use get_and_clear_ptes() to collect the dirty bits and mark the folio dirty before unmapping it. Update the comment. This was reproduced with shmem using MADV_COLLAPSE followed by MADV_PAGEOUT. Fix generated by an LLM and sent by Chris Mason in private. Fixes: 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") Fixes: 1b6444331bebb ("mm/khugepaged: enable clean pagecache folio collapse for writable files") Cc: stable@vger.kernel.org Signed-off-by: Chris Mason [ david: adjust comment; simplify description; cover file-thp as well ] Reviewed-by: Pedro Falcato Reviewed-by: Gregory Price (Meta) Tested-by: Gregory Price (Meta) Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-17-d6437171ecc3@kernel.org Reviewed-by: Lance Yang Reviewed-by: Baolin Wang Signed-off-by: David Hildenbrand (Arm) [ sashal: adapted batched PTE operations using folios to individual PTE operations using struct page ] Signed-off-by: Sasha Levin --- mm/khugepaged.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a7a8e6bc70b01..dfe8f42b35ad5 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1517,10 +1517,14 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) for (i = 0, addr = haddr, pte = start_pte; i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE, pte++) { struct page *page; + pte_t ptent; if (pte_none(*pte)) continue; page = vm_normal_page(vma, addr, *pte); + ptent = ptep_get_and_clear(mm, addr, pte); + if (pte_dirty(ptent)) + set_page_dirty(hpage); page_remove_rmap(page, false); } -- 2.53.0