mm/compaction: count pages and stop correctly during page isolation.
Subsystems (3)
PATCH v2 1/2 mm/compaction: count pages and stop correctly during page isolation.
From: Zi Yan <[email protected]>
In isolate_migratepages_block, when cc->alloc_contig is true, we are able to isolate compound pages, nr_migratepages and nr_isolated did not count compound pages correctly, causing us to isolate more pages than we thought. Use thp_nr_pages to count pages. Otherwise, we might be trapped in too_many_isolated while loop, since the actual isolated pages can go up to COMPACT_CLUSTER_MAX*512=16384, where COMPACT_CLUSTER_MAX is 32, since we stop isolation after cc->nr_migratepages reaches to COMPACT_CLUSTER_MAX.
In addition, after we fix the issue above, cc->nr_migratepages could never be equal to COMPACT_CLUSTER_MAX if compound pages are isolated, thus page isolation could not stop as we intended. Change the isolation stop condition to >=.
The issue can be triggered as follows:
In a system with 16GB memory and an 8GB CMA region reserved by hugetlb_cma, if we first allocate 10GB THPs and mlock them (so some THPs are allocated in the CMA region and mlocked), reserving 6 1GB hugetlb pages via /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages will get stuck (looping in too_many_isolated function) until we kill either task. With the patch applied, oom will kill the application with 10GB THPs and let hugetlb page reservation finish.
--- mm/compaction.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/compaction.c +4 -4
@@ -1012,8 +1012,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, isolate_success:list_add (&page->lru, &cc->migratepages); - cc->nr_migratepages++; - nr_isolated++; + cc->nr_migratepages +=compound_nr (page); + nr_isolated +=compound_nr (page);/* * Avoid isolating too much unless this block is being
@@ -1021,7 +1021,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,* or a lock is contended. For contention, isolate quickly to * potentially remove one source of contention. */ -if (cc->nr_migratepages ==COMPACT_CLUSTER_MAX && +if (cc->nr_migratepages >=COMPACT_CLUSTER_MAX && !cc->rescan && !cc->contended) { ++low_pfn;break ;
@@ -1132,7 +1132,7 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,if (!pfn)break ; -if (cc->nr_migratepages ==COMPACT_CLUSTER_MAX ) +if (cc->nr_migratepages >=COMPACT_CLUSTER_MAX )break ; }
Signature · 1 line
2.28.0
PATCH v2 2/2 mm/compaction: stop isolation if too many pages are isolated and we have pages to migrate.
From: Zi Yan <[email protected]>
In isolate_migratepages_block, if we have too many isolated pages and nr_migratepages is not zero, we should try to migrate what we have without wasting time on isolating.
--- mm/compaction.c | 4 ++++ 1 file changed, 4 insertions(+)
mm/compaction.c +4 -0
@@ -817,6 +817,10 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,* delay for some time until fewer pages are isolated */ while (unlikely (too_many_isolated (pgdat))) { +/* stop isolation if there are still pages not migrated */ +if (cc->nr_migratepages) +return 0 ; +/* async migration should just abort */ if (cc->mode ==MIGRATE_ASYNC )return 0 ;
Signature · 1 line
2.28.0
Quoted 4 lines · Zi Yan
In
isolate_migratepages_block, whencc->alloc_contigis true, we are able to isolate compound pages,nr_migratepagesandnr_isolateddid not count compound pages correctly, causing us to isolate more pages than we thought. Usethp_nr_pagesto count pages. Otherwise, we might be trapped
^^^^^^^^^^^^
Maybe replace that sentence with "Count compound pages as the number of base pages they contain"?
Zi Yan
reviewerQuoted 8 lines · Matthew Wilcox
Quoted 4 lines · Zi Yan
In
isolate_migratepages_block, whencc->alloc_contigis true, we are able to isolate compound pages,nr_migratepagesandnr_isolateddid not count compound pages correctly, causing us to isolate more pages than we thought. Usethp_nr_pagesto count pages. Otherwise, we might be trapped^^^^^^^^^^^^Maybe replace that sentence with "Count compound pages as the number of base pages they contain"?
Sure. And compound_nr is used instead of thp_nr_pages in fact.
OK. V3 is coming.
—
Best Regards,
Yan Zi