Commit 58420016303769f74c58248a59ca0f435041b352
Committed by
Linus Torvalds
Linus Torvalds
1 parent
c406515239
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
mm/compaction: skip the range until proper target pageblock is met
Commit 7d49d8868336 ("mm, compaction: reduce zone checking frequency in the migration scanner") has a side-effect that changes the iteration range calculation. Before the change, block_end_pfn is calculated using start_pfn, but now it blindly adds pageblock_nr_pages to the previous value. This causes the problem that isolation_start_pfn is larger than block_end_pfn when we isolate the page with more than pageblock order. In this case, isolation would fail due to an invalid range parameter. To prevent this, this patch implements skipping the range until a proper target pageblock is met. Without this patch, CMA with more than pageblock order always fails but with this patch it will succeed. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Minchan Kim <minchan@kernel.org> Cc: Michal Nazarewicz <mina86@mina86.com> Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 10 additions and 0 deletions Side-by-side Diff
mm/compaction.c
| ... | ... | @@ -479,6 +479,16 @@ |
| 479 | 479 | |
| 480 | 480 | block_end_pfn = min(block_end_pfn, end_pfn); |
| 481 | 481 | |
| 482 | + /* | |
| 483 | + * pfn could pass the block_end_pfn if isolated freepage | |
| 484 | + * is more than pageblock order. In this case, we adjust | |
| 485 | + * scanning range to right one. | |
| 486 | + */ | |
| 487 | + if (pfn >= block_end_pfn) { | |
| 488 | + block_end_pfn = ALIGN(pfn + 1, pageblock_nr_pages); | |
| 489 | + block_end_pfn = min(block_end_pfn, end_pfn); | |
| 490 | + } | |
| 491 | + | |
| 482 | 492 | if (!pageblock_pfn_to_page(pfn, block_end_pfn, cc->zone)) |
| 483 | 493 | break; |
| 484 | 494 |