Re: [PATCH v2 2/2] mm/huge_memory: flush dirty file PMDs before removing rmap
From: Kiryl Shutsemau (Meta)
Date: Mon Nov 16 2026 - 11:10:33 EST
On Mon, Nov 16, 2026 at 04:06:59PM +0100, David Hildenbrand (Arm) wrote:
> Unmapping a file PMD can lose concurrent stores when it races with
> writeback. zap_huge_pmd() removes rmap and drops the PMD lock before the
> gather flushes the TLB. Writeback can then clean the folio while another
> thread can still write through a stale writable TLB entry. Those stores
> do not fault and dirty the folio again. Filesystem DAX has the same
> problem with its dirty tags.
>
> Commit 5df397dec7c4 ("mm: delay page_remove_rmap() until after the TLB
> has been flushed") fixed the same race for PTEs by adding delayed rmap
> removal to the mmu_gather infrastructure. The PMD path still removes
> rmap before flushing.
>
> Flush the TLB under the PMD lock before removing rmap for dirty file
> PMDs. Skip the early flush at address-space teardown, when no users
> remain, and for mappings without writeback, including shmem and device
> DAX.
The patch looks good and you can use
Reviewed-by: Kiryl Shutsemau (Meta) <kas@xxxxxxxxxx>
But my LLM machinery flagged that __shmem_writeback() might need
fixing. Normal shmem doesn't have writeback, but i915 does its own, and
it is subject to the race.
+i915 folks.
Possible fix:
-- >8 --
From: "Kiryl Shutsemau (Meta)" <kas@xxxxxxxxxx>
Subject: [PATCH] drm/i915/gem: Skip writeback of shmem folios with extra
references
__shmem_writeback() writes out every dirty folio that is not mapped. A
folio stops being mapped when munmap() removes its rmap, but the TLB
flush comes later. Until then another thread can still store to it
through a stale TLB entry:
CPU0 (munmap) CPU1 (same mm) CPU2 (i915 shrinker)
zap_huge_pmd()
folio_remove_rmap_pmd()
__shmem_writeback()
clear dirty
!folio_mapped()
shmem_write_folio()
store via stale TLB
tlb_finish_mmu()
The store leaves the folio clean in the swap cache. Once reclaim frees
it, the object reads back from swap without that store.
The legacy mmap ioctl maps the shmem file directly, and i915 mounts it
with huge=within_size on some platforms, so the folio can be PMD-mapped.
The core mm keeps the rmap until after the flush for PTEs, but not for
shmem PMDs: shmem has no writeback, and pageout() refuses a folio with
an extra reference.
Do the same here. The unmapping side holds its reference until the TLB
is flushed, so a folio with references beyond the page cache and
writeback_iter() is left to reclaim, as a mapped one already is.
Fixes: 2d6692e642e7 ("drm/i915: Start writeback from the shrinker")
Signed-off-by: Kiryl Shutsemau (Meta) <kas@xxxxxxxxxx>
---
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index bf9e7480f0f5..748772c358ac 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -316,9 +316,15 @@ void __shmem_writeback(size_t size, struct address_space *mapping)
* leaving only CPU mmapings around) and add those folios to the LRU
* instead of invoking writeback so they are aged and paged out
* as normal.
+ *
+ * The same goes for a folio with references beyond the page cache
+ * and writeback_iter(). A folio that was just unmapped can still be
+ * written through a stale TLB entry until the unmapping side flushes
+ * the TLB and drops its reference. pageout() checks the same.
*/
while ((folio = writeback_iter(mapping, &wbc, folio, &error))) {
- if (folio_mapped(folio))
+ if (folio_mapped(folio) ||
+ folio_ref_count(folio) != 1 + folio_nr_pages(folio))
folio_redirty_for_writepage(&wbc, folio);
else
error = shmem_write_folio(folio);
--
Kiryl Shutsemau / Kirill A. Shutemov