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

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

cma: decrease cc.nr_migratepages after reclaiming pagelist 



reclaim_clean_pages_from_list() reclaims clean pages before migration so
cc.nr_migratepages should be updated.  Currently, there is no problem but
it can be wrong if we try to use the value in future.

Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e46a2879

mm/page_alloc.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -5674,7 +5674,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
					unsigned long start, unsigned long end)

					unsigned long start, unsigned long end)

{

{

	/* This function is based on compact_zone() from compaction.c. */

	/* This function is based on compact_zone() from compaction.c. */



	unsigned long nr_reclaimed;

	unsigned long pfn = start;

	unsigned long pfn = start;

	unsigned int tries = 0;

	unsigned int tries = 0;

	int ret = 0;

	int ret = 0;
@@ -5701,7 +5701,9 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
			break;

			break;

		}

		}





		reclaim_clean_pages_from_list(cc->zone, &cc->migratepages);

		nr_reclaimed = reclaim_clean_pages_from_list(cc->zone,

							&cc->migratepages);

		cc->nr_migratepages -= nr_reclaimed;





		ret = migrate_pages(&cc->migratepages,

		ret = migrate_pages(&cc->migratepages,

				    alloc_migrate_target,

				    alloc_migrate_target,