mm/migrate: preserve exact soft-dirty state

[thirdparty/kernel/stable.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index cc9f2bcd73b492aebacab4b812a515cf7e70b92b..05d6ca437321564925e4f1ac0e2949684c32b1f3 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -211,14 +211,17 @@ static bool remove_migration_pte(struct folio *folio,
                folio_get(folio);
                pte = mk_pte(new, READ_ONCE(vma->vm_page_prot));
                old_pte = ptep_get(pvmw.pte);
-               if (pte_swp_soft_dirty(old_pte))
-                       pte = pte_mksoft_dirty(pte);
 
                entry = pte_to_swp_entry(old_pte);
                if (!is_migration_entry_young(entry))
                        pte = pte_mkold(pte);
                if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
                        pte = pte_mkdirty(pte);
+               if (pte_swp_soft_dirty(old_pte))
+                       pte = pte_mksoft_dirty(pte);
+               else
+                       pte = pte_clear_soft_dirty(pte);
+
                if (is_writable_migration_entry(entry))
                        pte = pte_mkwrite(pte, vma);
                else if (pte_swp_uffd_wp(old_pte))