Skip to contentSkip to conversation

mm/migrate: fix NR_ISOLATED corruption on 64-bit

PATCH Applied Aneesh Kumar K.V 3 participants 3 messages Jul 28, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/migrate: fix NR_ISOLATED corruption on 64-bit

Similar to commit 2da9f6305f30 ("mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit") avoid using unsigned int for nr_pages. With unsigned int type the large unsigned int converts to a large positive signed long.

Symptoms include CMA allocations hanging forever
due to alloc_contig_range->...->isolate_migratepages_block waiting forever in "while (unlikely(too_many_isolated(pgdat)))".

Fixes c5fc5c3ae0c8 ("mm: migrate: account THP NUMA migration counters correctly")
Cc Yang Shi <[email protected]>
---
 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/migrate.c +1 -1
index 34a9ad3e0a4f..7e240437e7d9 100644
@@ -2068,7 +2068,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,
 	LIST_HEAD(migratepages);
 	new_page_t *new;
 	bool compound;
-	unsigned int nr_pages = thp_nr_pages(page);
+	int nr_pages = thp_nr_pages(page);
 
 	/*
 	 * PTE mapped THP or HugeTLB page can't reach here so the page could
Signature · 1 line
2.31.1
#1 lore raw
Quoted 22 lines · Aneesh Kumar K.V

Similar to commit 2da9f6305f30 ("mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit") avoid using unsigned int for nr_pages. With unsigned int type the large unsigned int converts to a large positive signed long.

Symptoms include CMA allocations hanging forever
due to alloc_contig_range->...->isolate_migratepages_block waiting forever in "while (unlikely(too_many_isolated(pgdat)))".

Fixes c5fc5c3ae0c8 ("mm: migrate: account THP NUMA migration counters correctly")
Cc Yang Shi <[email protected]>
---
  mm/migrate.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
mm/migrate.c +0 -0
index 34a9ad3e0a4f..7e240437e7d9 100644

mm/migrate.c int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, · line 2074

Quoted 8 lines
mm/migrate.c +1 -1
@@ -2068,7 +2068,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,
  	LIST_HEAD(migratepages);
  	new_page_t *new;
  	bool compound;
-	unsigned int nr_pages = thp_nr_pages(page);
+	int nr_pages = thp_nr_pages(page);
 
  	/*
  	 * PTE mapped THP or HugeTLB page can't reach here so the page could

Already posted:

https://lkml.kernel.org/r/[email protected]

but this patch description is a lot better.

Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1
#2 lore raw
In reply to Aneesh Kumar K.V
Quoted 5 lines · Aneesh Kumar K.V

Similar to commit 2da9f6305f30 ("mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit") avoid using unsigned int for nr_pages. With unsigned int type the large unsigned int converts to a large positive signed long.

Quoted 8 lines

Symptoms include CMA allocations hanging forever
due to alloc_contig_range->...->isolate_migratepages_block waiting forever in "while (unlikely(too_many_isolated(pgdat)))".

Fixes c5fc5c3ae0c8 ("mm: migrate: account THP NUMA migration counters correctly")
Cc Yang Shi <[email protected]>

It seems Andrew picked this one. Either one is fine to me.

Quoted 20 lines
---
 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/migrate.c +1 -2
index 34a9ad3e0a4f..7e240437e7d9 100644
@@ -2068,7 +2068,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma,
        LIST_HEAD(migratepages);
        new_page_t *new;
        bool compound;
-       unsigned int nr_pages = thp_nr_pages(page);
+       int nr_pages = thp_nr_pages(page);
 
        /*
         * PTE mapped THP or HugeTLB page can't reach here so the page could
--

2.31.1