mm/compaction: check pageblock suitability once per pageblock (c122b208) · Commits · 戴 / test

isolation_suitable() and migrate_async_suitable() is used to be sure that this pageblock range is fine to be migragted. It isn't needed to call it on every page. Current code do well if not suitable, but, don't do well when suitable. 1) It re-checks isolation_suitable() on each page of a pageblock that was already estabilished as suitable. 2) It re-checks migrate_async_suitable() on each page of a pageblock that was not entered through the next_pageblock: label, because last_pageblock_nr is not otherwise updated. This patch fixes situation by 1) calling isolation_suitable() only once per pageblock and 2) always updating last_pageblock_nr to the pageblock that was just checked. Additionally, move PageBuddy() check after pageblock unit check, since pageblock check is the first thing we should do and makes things more simple. [vbabka@suse.cz: rephrase commit description] Signed-off-by:

Joonsoo Kim <iamjoonsoo.kim@lge.com> Acked-by:

Vlastimil Babka <vbabka@suse.cz> Cc: Mel Gorman <mgorman@suse.de> Cc: Rik van Riel <riel@redhat.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/compaction.c

+19 −15

Original line number	Diff line number	Diff line
		@@ -526,27 +526,32 @@ isolate_migratepages_range(struct zone zone, struct compact_control cc,

		/* If isolation recently failed, do not retry */
		pageblock_nr = low_pfn >> pageblock_order;
		if (last_pageblock_nr != pageblock_nr) {
		int mt;

		last_pageblock_nr = pageblock_nr;
		if (!isolation_suitable(cc, page))
		goto next_pageblock;

		/*
		* Skip if free. page_order cannot be used without zone->lock
		* as nothing prevents parallel allocations or buddy merging.
		*/
		if (PageBuddy(page))
		continue;

		/*
		* For async migration, also only scan in MOVABLE blocks. Async
		* migration is optimistic to see if the minimum amount of work
		* satisfies the allocation
		* For async migration, also only scan in MOVABLE
		* blocks. Async migration is optimistic to see if
		* the minimum amount of work satisfies the allocation
		*/
		if (!cc->sync && last_pageblock_nr != pageblock_nr &&
		!migrate_async_suitable(get_pageblock_migratetype(page))) {
		mt = get_pageblock_migratetype(page);
		if (!cc->sync && !migrate_async_suitable(mt)) {
		cc->finished_update_migrate = true;
		skipped_async_unsuitable = true;
		goto next_pageblock;
		}
		}

		/*
		* Skip if free. page_order cannot be used without zone->lock
		* as nothing prevents parallel allocations or buddy merging.
		*/
		if (PageBuddy(page))
		continue;

		/*
		* Check may be lockless but that's ok as we recheck later.
		@@ -639,7 +644,6 @@ check_compact_cluster:

		next_pageblock:
		low_pfn = ALIGN(low_pfn + 1, pageblock_nr_pages) - 1;
		last_pageblock_nr = pageblock_nr;
		}

		acct_isolated(zone, locked, cc);

Admin message