[PATCH for v3.18] mm/compaction: skip the range until proper target pageblock is met

[Joonsoo Kim]

commit 7d49d8868336 ("mm, compaction: reduce zone checking frequency in
the migration scanner") makes side-effect that change iteration
range calculation. Before change, block_end_pfn is calculated using
start_pfn, but, now, blindly add pageblock_nr_pages to previous value.

This cause the problem that isolation_start_pfn is larger than
block_end_pfn when we isolation the page with more than pageblock order.
In this case, isolation would be failed due to invalid range parameter.

To prevent this, this patch implement skipping the range until proper
target pageblock is met. Without this patch, CMA with more than pageblock
order always fail, but, with this patch, it will succeed.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
---
 mm/compaction.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index ec74cf0..212682a 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -472,18 +472,20 @@ isolate_freepages_range(struct compact_control *cc,
 	pfn = start_pfn;
 	block_end_pfn = ALIGN(pfn + 1, pageblock_nr_pages);
 
-	for (; pfn < end_pfn; pfn += isolated,
-				block_end_pfn += pageblock_nr_pages) {
+	for (; pfn < end_pfn; block_end_pfn += pageblock_nr_pages) {
 		/* Protect pfn from changing by isolate_freepages_block */
 		unsigned long isolate_start_pfn = pfn;
 
 		block_end_pfn = min(block_end_pfn, end_pfn);
+		if (pfn >= block_end_pfn)
+			continue;
 
 		if (!pageblock_pfn_to_page(pfn, block_end_pfn, cc->zone))
 			break;
 
 		isolated = isolate_freepages_block(cc, &isolate_start_pfn,
 						block_end_pfn, &freelist, true);
+		pfn += isolated;
 
 		/*
 		 * In strict mode, isolate_freepages_block() returns 0 if
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/