Commit 98dd3b48 authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Linus Torvalds
Browse files

mm, compaction: do not count compact_stall if all zones skipped compaction 



The compact_stall vmstat counter counts the number of allocations stalled
by direct compaction.  It does not count when all attempted zones had
deferred compaction, but it does count when all zones skipped compaction.
The skipping is decided based on very early check of
compaction_suitable(), based on watermarks and memory fragmentation.
Therefore it makes sense not to count skipped compactions as stalls.
Moreover, compact_success or compact_fail is also already not being
counted when compaction was skipped, so this patch changes the
compact_stall counting to match the other two.

Additionally, restructure __alloc_pages_direct_compact() code for better
readability.

Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Minchan Kim <minchan@kernel.org>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53853e2d

mm/page_alloc.c

+41 −35
Original line number Diff line number Diff line
@@ -2301,7 +2301,7 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order, 
{

	struct zone *last_compact_zone = NULL;

	unsigned long compact_result;



	struct page *page;



	if (!order)

		return NULL;
@@ -2313,13 +2313,21 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order, 
						&last_compact_zone);

	current->flags &= ~PF_MEMALLOC;



	if (compact_result > COMPACT_DEFERRED)

		count_vm_event(COMPACTSTALL);

	else

	switch (compact_result) {

	case COMPACT_DEFERRED:

		*deferred_compaction = true;

		/* fall-through */

	case COMPACT_SKIPPED:

		return NULL;

	default:

		break;

	}



	if (compact_result > COMPACT_SKIPPED) {

		struct page *page;

	/*

	 * At least in one zone compaction wasn't deferred or skipped, so let's

	 * count a compaction stall

	 */

	count_vm_event(COMPACTSTALL);



	/* Page migration frees to the PCP lists but we want merging */

	drain_pages(get_cpu());
@@ -2340,22 +2348,20 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order, 
	}



	/*

		 * last_compact_zone is where try_to_compact_pages thought

		 * allocation should succeed, so it did not defer compaction.

		 * But now we know that it didn't succeed, so we do the defer.

	 * last_compact_zone is where try_to_compact_pages thought allocation

	 * should succeed, so it did not defer compaction. But here we know

	 * that it didn't succeed, so we do the defer.

	 */

	if (last_compact_zone && mode != MIGRATE_ASYNC)

		defer_compaction(last_compact_zone, order);



	/*

		 * It's bad if compaction run occurs and fails.

		 * The most likely reason is that pages exist,

		 * but not enough to satisfy watermarks.

	 * It's bad if compaction run occurs and fails. The most likely reason

	 * is that pages exist, but not enough to satisfy watermarks.

	 */

	count_vm_event(COMPACTFAIL);



	cond_resched();

	}



	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE