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=1794795395; b=gTDJKXHa4haIBUob/jKd+TyX+hUTIU0DprdCZpy1/umI6f2vFfqKxXsishUbppTsXxY1 qogUU2k3LcJbVSBG/a92yk4y2rvVuTc/piAqQNsQbABxOLWrubHWMXxuZyt294V1luawA OPmzHQVEyLcxLiycI2UK9t/1yYGPty0od8oCE5LKXWyms7AA6p031jXQN8b669NanH+CN biaC94AfyJmDMxwNeKnQz89FEB9pWFcjhEBZjPnoPgxC3nuaH7uD+X/AgiDF8bECZaqZF xjKPr2XdvLOBk629hYL1HHqbu1Z4I7lSGGfHpbGh2WZBWEJXA5VpYw8pLzsSQoS9VTQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794795395; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=dJ770QTyHlT3R1FacxceaX+27jgJG/EikmN6GHu8EmE=; b=dYWxfhvC97RqBWn0UR2+AAxcGaOIZkGUm1auP4OmDgbcShtbhGvlBKhCUiwd6o8V/EQ1 huUzgS+UEmkCinb6pO+Zt7w9G2QbWVKDhDpo5xV+n3QPfwbqeEcGvgh0x66IE1An0wRVi bZE4rQOUasYTOJ1Xjw8i6q4eSsbNWnBUHTV43mox+GRPIEGJNAZub8eixJKLMnqJk1tVv mfvXaX1OkQt6p/V0cqz2bGUKgCAl4CkpRhCg/gVf5H/zG1kXCVPeYePmeT5FuXccGW+8C inCF+oSklKG9wI4dVRGnADh/UK4dI3kua4hFbD+/khDlkkvgdrCGSPjHznxIHzsWLNA== 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=IbZGqKe9; 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 44095606A321 for ; Mon, 16 Nov 2026 02:16:35 +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=IbZGqKe9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEE4C1F000C4; Mon, 16 Nov 2026 02:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794795394; bh=dJ770QTyHlT3R1FacxceaX+27jgJG/EikmN6GHu8EmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IbZGqKe9IiAE3vnYM1KUmlLWc/VfyQZaY5A9RfM9t2aGDCgtG3qnusOyaNC2Kt7sg 3xXoWMOTRX5/YSgp7L6n8GBPbgWugWkaHf+yvcatJiWdvHihoXRZZCpqKYJDDAmqWF dfHMcATcTJd0US+B+fT/8swkeqaOdTxUZxDT+InnV7Ctq+7lYaaWWMFcnXL7ld4lNC NxRwQ95UIbCysWQin8YpW9QCoAZIwW9Gn5MsqfOFeHeLIL7ZNin0mHng5VmIosY4fg gBB2HSA4m0a6jobMfUc3apNyqHh13kCCaaFFNzK8s7s3kNxvJgcIXHVB5oby2/swPg zIh0Ro+/RmgZg== 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 6.1.y] mm/khugepaged: preserve dirty bits when collapsing PTE-mapped THPs Date: Sun, 15 Nov 2026 21:16:32 -0500 Message-ID: <20261116014403.2235359-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109201818-failed-6.1-fe2817e3d5ea@kernel.org> References: <20261109201818-failed-6.1-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 and folio handling to the existing per-PTE loop using ptep_get_and_clear() and set_page_dirty() ] 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 f21b78228cb40..e679ca54b4474 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1562,12 +1562,16 @@ int 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); if (WARN_ON_ONCE(page && is_zone_device_page(page))) goto abort; + ptent = ptep_get_and_clear(mm, addr, pte); + if (pte_dirty(ptent)) + set_page_dirty(hpage); page_remove_rmap(page, vma, false); } -- 2.53.0