1 files changed, 12 insertions, 4 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index 5325211398f8..e609415059e8 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1061,6 +1061,9 @@ static bool suitable_migration_source(struct compact_control *cc,
 {
         int block_mt;
 
+        if (pageblock_skip_persistent(page))
+                return false;
+
         if ((cc->mode != MIGRATE_ASYNC) || !cc->direct_compaction)
                 return true;
 
@@ -1697,12 +1700,17 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                         continue;
 
                 /*
-                 * For async compaction, also only scan in MOVABLE blocks.
-                 * Async compaction is optimistic to see if the minimum amount
-                 * of work satisfies the allocation.
+                 * For async compaction, also only scan in MOVABLE blocks
+                 * without huge pages. Async compaction is optimistic to see
+                 * if the minimum amount of work satisfies the allocation.
+                 * The cached PFN is updated as it's possible that all
+                 * remaining blocks between source and target are unsuitable
+                 * and the compaction scanners fail to meet.
                  */
-                if (!suitable_migration_source(cc, page))
+                if (!suitable_migration_source(cc, page)) {
+                        update_cached_migrate(cc, block_end_pfn);
                         continue;
+                }
 
                 /* Perform the isolation */
                 low_pfn = isolate_migratepages_block(cc, low_pfn,