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

Commit 86cfd3a4 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm/vmscan.c: consider swap space when deciding whether to continue reclaim 



It's pointless to continue reclaiming when we have no swap space and lots
of anon pages in the inactive list.

Without this patch, it is possible when swap is disabled to continue
trying to reclaim when there are only anonymous pages in the system even
though that will not make any progress.

Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 799f933a

mm/vmscan.c

+3 −2
Original line number Diff line number Diff line
@@ -2000,8 +2000,9 @@ static inline bool should_continue_reclaim(struct zone *zone, 
	 * inactive lists are large enough, continue reclaiming

	 */

	pages_for_compaction = (2UL << sc->order);

	inactive_lru_pages = zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON) +

				zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE);

	inactive_lru_pages = zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE);

	if (nr_swap_pages > 0)

		inactive_lru_pages += zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON);

	if (sc->nr_reclaimed < pages_for_compaction &&

			inactive_lru_pages > pages_for_compaction)

		return true;