Skip to contentSkip to conversation

mm/migrate_device: Return number of migrating pages in args->cpages

PATCH Applied Alistair Popple 2 participants 3 messages Nov 11, 2022 – Nov 16, 2022

Subsystems (2)
lore
Share & tools
lore

Alistair Popple

author reviewer
#0 lore raw

PATCH 1/1 mm/migrate_device: Return number of migrating pages in args->cpages

migrate_vma->cpages originally contained a count of the number of pages migrating including non-present pages which can be poluated directly on the target.

Commit 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()") inadvertantly changed this to contain just the number of pages that were unmapped. Usage of migrate_vma->cpages isn't documented, but most drivers use it to see if all the requested addresses can be migrated so restore the original behaviour.

Fixes 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()")
Cc John Hubbard <[email protected]>
Cc Alex Sierra <[email protected]>
Cc Ben Skeggs <[email protected]>
Cc Felix Kuehling <[email protected]>
Cc Lyude Paul <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc Michael Ellerman <[email protected]>

---

Hi Andrew, hoping you can merge this small fix which Ralph reported to me for v6.1-rcX.

---
 mm/migrate_device.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
mm/migrate_device.c +6 -2
index 6fa682eef7a0..721b2365dbca 100644
@@ -357,7 +357,8 @@ static bool migrate_vma_check_page(struct page *page, struct page *fault_page)
 }
 
 /*
- * Unmaps pages for migration. Returns number of unmapped pages.
+ * Unmaps pages for migration. Returns number of source pfns marked as
+ * migrating.
  */
 static unsigned long migrate_device_unmap(unsigned long *src_pfns,
 					  unsigned long npages,
@@ -373,8 +374,11 @@ static unsigned long migrate_device_unmap(unsigned long *src_pfns,
 		struct page *page = migrate_pfn_to_page(src_pfns[i]);
 		struct folio *folio;
 
-		if (!page)
+		if (!page) {
+			if (src_pfns[i] & MIGRATE_PFN_MIGRATE)
+				unmapped++;
 			continue;
+		}
 
 		/* ZONE_DEVICE pages are not on LRU */
 		if (!is_zone_device_page(page)) {
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Alistair Popple

migrate_vma->cpages originally contained a count of the number of pages migrating including non-present pages which can be poluated

"populated"

Quoted 9 lines

directly on the target.

Commit 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()") inadvertantly changed this to contain just the number of pages that were unmapped. Usage of migrate_vma->cpages isn't documented, but most drivers use it to see if all the requested addresses can be migrated so restore the original behaviour.

Quoted 3 lines
Fixes 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()")

You can add

Thanks!

author reviewer
#2 lore raw

Hi Andrew,

I realize it's getting late in the cycle but any chance you could take this one as well for v6.1-rc6? It fixes a minor bug introduced in v6.1-rc1 which could cause some drivers to think they can't migrate pages when they can. Thanks.

Quoted 23 lines · Ralph Campbell
Quoted 2 lines · Alistair Popple

migrate_vma->cpages originally contained a count of the number of pages migrating including non-present pages which can be poluated

"populated"

Quoted 9 lines

directly on the target.

Commit 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()") inadvertantly changed this to contain just the number of pages that were unmapped. Usage of migrate_vma->cpages isn't documented, but most drivers use it to see if all the requested addresses can be migrated so restore the original behaviour.

Quoted 3 lines
Fixes 241f68859656 ("mm/migrate_device.c: refactor migrate_vma and migrate_deivce_coherent_page()")

You can add

Thanks!