Skip to contentSkip to conversation

mm-huge_memory-fix-folio_set_dirty-vs-folio_mark_dirty.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 26, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/huge_memory: fix folio_set_dirty() vs. folio_mark_dirty()
has been removed from the -mm tree. Its filename was
mm-huge_memory-fix-folio_set_dirty-vs-folio_mark_dirty.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: David Hildenbrand <[email protected]>
Subject: mm/huge_memory: fix folio_set_dirty() vs. folio_mark_dirty()
Date: Mon, 22 Jan 2024 18:54:07 +0100

The correct folio replacement for "set_page_dirty()" is "folio_mark_dirty()", not "folio_set_dirty()". Using the latter won't properly inform the FS using the dirty_folio() callback.

This has been found by code inspection, but likely this can result in some real trouble.

Fixes a8e61d584eda0 ("mm/huge_memory: page_remove_rmap() -> folio_remove_rmap_pmd()")
Cc Ryan Roberts <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>

---

 mm/huge_memory.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-fix-folio_set_dirty-vs-folio_mark_dirty +2 -2
@@ -2437,7 +2437,7 @@ static void __split_huge_pmd_locked(stru
 			page = pmd_page(old_pmd);
 			folio = page_folio(page);
 			if (!folio_test_dirty(folio) && pmd_dirty(old_pmd))
-				folio_set_dirty(folio);
+				folio_mark_dirty(folio);
 			if (!folio_test_referenced(folio) && pmd_young(old_pmd))
 				folio_set_referenced(folio);
 			folio_remove_rmap_pmd(folio, page, vma);
@@ -3563,7 +3563,7 @@ int set_pmd_migration_entry(struct page_
 	}
 
 	if (pmd_dirty(pmdval))
-		folio_set_dirty(folio);
+		folio_mark_dirty(folio);
 	if (pmd_write(pmdval))
 		entry = make_writable_migration_entry(page_to_pfn(page));
 	else if (anon_exclusive)

_

Patches currently in -mm which might be from [email protected] are