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

Commit da1c67a7 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm, compaction: determine isolation mode only once 



The conditions that control the isolation mode in
isolate_migratepages_range() do not change during the iteration, so
extract them out and only define the value once.

This actually does have an effect, gcc doesn't optimize it itself because
of cc->sync.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 539a13b4

mm/compaction.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -460,12 +460,13 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, 
	unsigned long last_pageblock_nr = 0, pageblock_nr;

	unsigned long last_pageblock_nr = 0, pageblock_nr;

	unsigned long nr_scanned = 0, nr_isolated = 0;

	unsigned long nr_scanned = 0, nr_isolated = 0;

	struct list_head *migratelist = &cc->migratepages;

	struct list_head *migratelist = &cc->migratepages;

	isolate_mode_t mode = 0;

	struct lruvec *lruvec;

	struct lruvec *lruvec;

	unsigned long flags;

	unsigned long flags;

	bool locked = false;

	bool locked = false;

	struct page *page = NULL, *valid_page = NULL;

	struct page *page = NULL, *valid_page = NULL;

	bool skipped_async_unsuitable = false;

	bool skipped_async_unsuitable = false;

	const isolate_mode_t mode = (!cc->sync ? ISOLATE_ASYNC_MIGRATE : 0) |

				    (unevictable ? ISOLATE_UNEVICTABLE : 0);





	/*

	/*

	 * Ensure that there are not too many pages isolated from the LRU

	 * Ensure that there are not too many pages isolated from the LRU
@@ -608,12 +609,6 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, 
			continue;

			continue;

		}

		}





		if (!cc->sync)

			mode |= ISOLATE_ASYNC_MIGRATE;



		if (unevictable)

			mode |= ISOLATE_UNEVICTABLE;



		lruvec = mem_cgroup_page_lruvec(page, zone);

		lruvec = mem_cgroup_page_lruvec(page, zone);





		/* Try isolate the page */

		/* Try isolate the page */