Commit 39cec512 authored by David Hildenbrand's avatar David Hildenbrand Committed by Kefeng Wang
Browse files

mm/huge_memory: fix folio_set_dirty() vs. folio_mark_dirty() 

mainline inclusion
from mainline-v6.8-rc3
commit db44c658f798ad907219f15e033229b8d1aadb93
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CESE
CVE: NA

-------------------------------------------------

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.

Link: https://lkml.kernel.org/r/20240122175407.307992-1-david@redhat.com


Fixes: a8e61d584eda0 ("mm/huge_memory: page_remove_rmap() -> folio_remove_rmap_pmd()")
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit db44c658f798ad907219f15e033229b8d1aadb93)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 4dbd2920

mm/huge_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, 
			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);

			add_reliable_page_counter(page, mm, -HPAGE_PMD_NR);
@@ -3425,7 +3425,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, 
	}



	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)