From: Kemeng Shi <shikemeng@huaweicloud.com>
Date: Fri, 4 Aug 2023 11:04:54 +0000 (+0800)
Subject: mm/compaction: only set skip flag if cc->no_set_skip_hint is false
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=18c59d58baa60a8bfaec58d29b6b94877664eed8;p=linux.git

mm/compaction: only set skip flag if cc->no_set_skip_hint is false

Keep the same logic as update_pageblock_skip, only set skip if
no_set_skip_hint is false which is more reasonable.

Link: https://lkml.kernel.org/r/20230804110454.2935878-9-shikemeng@huaweicloud.com
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.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 91a9dfa41ef47..fe7b4e7c5d240 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1442,7 +1442,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn)
 	isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false);
 
 	/* Skip this pageblock in the future as it's full or nearly full */
-	if (start_pfn == end_pfn)
+	if (start_pfn == end_pfn && !cc->no_set_skip_hint)
 		set_pageblock_skip(page);
 }