mm/compaction: skip page block marked skip in isolate_migratepages_block

Move migrate_pfn to page block end when block is marked skip to avoid
   unnecessary scan retry of that block from upper caller.  For example,
   compact_zone may wrongly rescan skip page block with finish_pageblock
   set as following:

1. cc->migrate point to the start of page block

2. compact_zone record last_migrated_pfn to cc->migrate

3. compact_zone->isolate_migratepages->isolate_migratepages_block
   tries to scan the block.  The low_pfn maybe moved forward to middle of
   block because of free pages at beginning of block.

4. we find first lru page could be isolated but block was exclusive
   marked skip.

5. abort isolate_migratepages_block and make cc->migrate_pfn point to
   found lru page at middle of block.

6. compact_zone find cc->migrate_pfn and last_migrated_pfn are in the
   same block and wrongly rescan the block with finish_pageblock set.

Link: https://lkml.kernel.org/r/20230804110454.2935878-4-shikemeng@huaweicloud.com
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/compaction.c b/mm/compaction.c
index bc2eda71179ae431a79b4c966b15c8ac2fd2b0bc..78826c433ef6937d2cbb275adfa5567de931bec3 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1140,6 +1140,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                                skip_updated = true;
                                if (test_and_set_skip(cc, valid_page) &&
                                    !cc->finish_pageblock) {
+                                       low_pfn = end_pfn;
                                        goto isolate_abort;
                                }
                        }