mm-khugepaged-add-folio-dirty-check-after-try_to_unmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: add folio dirty check after try_to_unmap()
has been removed from the -mm tree. Its filename was
mm-khugepaged-add-folio-dirty-check-after-try_to_unmap.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm/khugepaged: add folio dirty check after try_to_unmap()
Date: Sun, 17 May 2026 09:54:04 -0400
This check ensures the correctness of read-only PMD folio collapse after it is enabled for all FSes supporting PMD pagecache folios and replaces READ_ONLY_THP_FOR_FS.
READ_ONLY_THP_FOR_FS only supports read-only fd and uses mapping->nr_thps and inode->i_writecount to prevent any write to read-only to-be-collapsed folios. In upcoming commits, READ_ONLY_THP_FOR_FS will be removed and the aforementioned mechanism will go away too. To ensure khugepaged functions as expected after the changes, skip if any folio is dirty after try_to_unmap(), since a dirty folio at that point means this read-only folio can get writes between try_to_unmap() and try_to_unmap_flush() via cached TLB entries and khugepaged does not support writable pagecache folio collapse yet.
---
mm/khugepaged.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-add-folio-dirty-check-after-try_to_unmap +24 -4
@@ -2338,8 +2338,7 @@ static enum scan_result collapse_file(st } }else if (folio_test_dirty (folio)) {/* -* khugepaged only works on read-only fd, -* so this page is dirty because it hasn't +* This page is dirty because it hasn't * been flushed since first write. There * won't be new dirty pages. *
@@ -2397,8 +2396,8 @@ static enum scan_result collapse_file(stif (!is_shmem && (folio_test_dirty (folio) ||folio_test_writeback (folio))) {/* -* khugepaged only works on read-only fd, so this -* folio is dirty because it hasn't been flushed +* khugepaged only works on clean file-backed folios, +* so this folio is dirty because it hasn't been flushed * since first write. */ result =SCAN_PAGE_DIRTY_OR_WRITEBACK ;
@@ -2440,6 +2439,27 @@ static enum scan_result collapse_file(stxas_unlock_irq (&xas);folio_putback_lru (folio); goto out_unlock; + } + +/* +* At this point, the folio is locked and unmapped. If the PTE +* was dirty, try_to_unmap() has transferred the dirty bit to +* the folio and we must not collapse it into a clean +* file-backed folio. +* +* If the folio is clean here, no one can write it until we +* drop the folio lock. A write through a stale TLB entry came +* from a clean PTE and must fault because the PTE has been +* cleared; the fault path has to take the folio lock before +* installing a writable mapping. Buffered write paths also +* have to take the folio lock before modifying file contents +* without a mapping, typically via write_begin_get_folio(). +*/ +if (!is_shmem &&folio_test_dirty (folio)) { + result =SCAN_PAGE_DIRTY_OR_WRITEBACK ; +xas_unlock_irq (&xas); +folio_putback_lru (folio); + goto out_unlock; }/*
_
Patches currently in -mm which might be from [email protected] are