Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 783f56c1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: compaction: avoid 100% CPU usage during compaction when a task is killed"

parents 410d7770 4375a566

mm/compaction.c

+7 −4
Original line number Diff line number Diff line
@@ -842,13 +842,15 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, 


		/*

		 * Periodically drop the lock (if held) regardless of its

		 * contention, to give chance to IRQs. Abort async compaction

		 * if contended.

		 * contention, to give chance to IRQs. Abort completely if

		 * a fatal signal is pending.

		 */

		if (!(low_pfn % SWAP_CLUSTER_MAX)

		    && compact_unlock_should_abort(zone_lru_lock(zone), flags,

								&locked, cc))

			break;

								&locked, cc)) {

			low_pfn = 0;

			goto fatal_pending;

		}



		if (!pfn_valid_within(low_pfn))

			goto isolate_fail;
@@ -1060,6 +1062,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, 
	trace_mm_compaction_isolate_migratepages(start_pfn, low_pfn,

						nr_scanned, nr_isolated);



fatal_pending:

	cc->total_migrate_scanned += nr_scanned;

	if (nr_isolated)

		count_compact_events(COMPACTISOLATED, nr_isolated);