[PATCH 3/3] mm/migrate: batch PTE restoration for device-private folios
From: Wandun Chen
Date: Thu Nov 19 2026 - 22:30:28 EST
From: Wandun Chen <chenwandun@xxxxxxxxxxx>
Device-private PTEs encode PFN as softleaf offset. set_ptes() does not
handle this encoding when constructing subsequent PTEs, such as on
arm64 with a 16KB page granule, leaving device-private destinations
folio unbatched.
Add set_device_private_ptes() to construct subsequent entries with
pte_next_swp_offset(). This enables remove_migration_pte() to batch
PTE restoration for device-private folios.
Signed-off-by: Wandun Chen <chenwandun@xxxxxxxxxxx>
---
mm/migrate.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index e000ef77ea87..3d3d91fd61c7 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -345,6 +345,19 @@ struct rmap_walk_arg {
bool map_unused_to_zeropage;
};
+static void set_device_private_ptes(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep, pte_t pte, unsigned int nr)
+{
+ for (;;) {
+ set_pte_at(mm, addr, ptep, pte);
+ if (--nr == 0)
+ break;
+ addr += PAGE_SIZE;
+ ptep++;
+ pte = pte_next_swp_offset(pte);
+ }
+}
+
/*
* Restore a potential migration pte to a working pte entry
*/
@@ -442,8 +455,7 @@ static bool remove_migration_pte(struct folio *folio,
} else
#endif
{
- if (folio_test_large(rmap_walk_arg->folio) &&
- !is_device_private_page(new)) {
+ if (folio_test_large(rmap_walk_arg->folio)) {
unsigned long end_addr = pmd_addr_end(pvmw.address, vma->vm_end);
unsigned long max_nr = (end_addr - pvmw.address) >> PAGE_SHIFT;
@@ -463,7 +475,11 @@ static bool remove_migration_pte(struct folio *folio,
pvmw.address, rmap_flags);
else
folio_add_file_rmap_ptes(folio, new, nr, vma);
- set_ptes(vma->vm_mm, pvmw.address, pvmw.pte, pte, nr);
+ if (unlikely(is_device_private_page(new)))
+ set_device_private_ptes(vma->vm_mm, pvmw.address,
+ pvmw.pte, pte, nr);
+ else
+ set_ptes(vma->vm_mm, pvmw.address, pvmw.pte, pte, nr);
ptes += nr;
}
--
2.43.0