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

Commit 4d8bdf7f authored by Yafang Shao's avatar Yafang Shao Committed by Greg Kroah-Hartman
Browse files

mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone 

[ Upstream commit a94b525241c0fff3598809131d7cfcfe1d572d8c ]

total_{migrate,free}_scanned will be added to COMPACTMIGRATE_SCANNED and
COMPACTFREE_SCANNED in compact_zone().  We should clear them before
scanning a new zone.  In the proc triggered compaction, we forgot clearing
them.

[laoar.shao@gmail.com: introduce a helper compact_zone_counters_init()]
  Link: http://lkml.kernel.org/r/1563869295-25748-1-git-send-email-laoar.shao@gmail.com
[akpm@linux-foundation.org: expand compact_zone_counters_init() into its single callsite, per mhocko]
[vbabka@suse.cz: squash compact_zone() list_head init as well]
  Link: http://lkml.kernel.org/r/1fb6f7da-f776-9e42-22f8-bbb79b030b98@suse.cz
[akpm@linux-foundation.org: kcompactd_do_work(): avoid unnecessary initialization of cc.zone]
Link: http://lkml.kernel.org/r/1563789275-9639-1-git-send-email-laoar.shao@gmail.com


Fixes: 7f354a54 ("mm, compaction: add vmstats for kcompactd work")
Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Cc: Yafang Shao <shaoyafang@didiglobal.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5bead06b

mm/compaction.c

+13 −22
Original line number Diff line number Diff line
@@ -1540,6 +1540,17 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro 
	unsigned long end_pfn = zone_end_pfn(zone);

	const bool sync = cc->mode != MIGRATE_ASYNC;



	/*

	 * These counters track activities during zone compaction.  Initialize

	 * them before compacting a new zone.

	 */

	cc->total_migrate_scanned = 0;

	cc->total_free_scanned = 0;

	cc->nr_migratepages = 0;

	cc->nr_freepages = 0;

	INIT_LIST_HEAD(&cc->freepages);

	INIT_LIST_HEAD(&cc->migratepages);



	cc->migratetype = gfpflags_to_migratetype(cc->gfp_mask);

	ret = compaction_suitable(zone, cc->order, cc->alloc_flags,

							cc->classzone_idx);
@@ -1703,10 +1714,6 @@ static enum compact_result compact_zone_order(struct zone *zone, int order, 
{

	enum compact_result ret;

	struct compact_control cc = {

		.nr_freepages = 0,

		.nr_migratepages = 0,

		.total_migrate_scanned = 0,

		.total_free_scanned = 0,

		.order = order,

		.gfp_mask = gfp_mask,

		.zone = zone,
@@ -1719,8 +1726,6 @@ static enum compact_result compact_zone_order(struct zone *zone, int order, 
		.ignore_skip_hint = (prio == MIN_COMPACT_PRIORITY),

		.ignore_block_suitable = (prio == MIN_COMPACT_PRIORITY)

	};

	INIT_LIST_HEAD(&cc.freepages);

	INIT_LIST_HEAD(&cc.migratepages);



	ret = compact_zone(zone, &cc);
@@ -1819,8 +1824,6 @@ static void compact_node(int nid) 
	struct zone *zone;

	struct compact_control cc = {

		.order = -1,

		.total_migrate_scanned = 0,

		.total_free_scanned = 0,

		.mode = MIGRATE_SYNC,

		.ignore_skip_hint = true,

		.whole_zone = true,
@@ -1834,11 +1837,7 @@ static void compact_node(int nid) 
		if (!populated_zone(zone))

			continue;



		cc.nr_freepages = 0;

		cc.nr_migratepages = 0;

		cc.zone = zone;

		INIT_LIST_HEAD(&cc.freepages);

		INIT_LIST_HEAD(&cc.migratepages);



		compact_zone(zone, &cc);
@@ -1947,8 +1946,6 @@ static void kcompactd_do_work(pg_data_t *pgdat) 
	struct zone *zone;

	struct compact_control cc = {

		.order = pgdat->kcompactd_max_order,

		.total_migrate_scanned = 0,

		.total_free_scanned = 0,

		.classzone_idx = pgdat->kcompactd_classzone_idx,

		.mode = MIGRATE_SYNC_LIGHT,

		.ignore_skip_hint = false,
@@ -1972,16 +1969,10 @@ static void kcompactd_do_work(pg_data_t *pgdat) 
							COMPACT_CONTINUE)

			continue;



		cc.nr_freepages = 0;

		cc.nr_migratepages = 0;

		cc.total_migrate_scanned = 0;

		cc.total_free_scanned = 0;

		cc.zone = zone;

		INIT_LIST_HEAD(&cc.freepages);

		INIT_LIST_HEAD(&cc.migratepages);



		if (kthread_should_stop())

			return;



		cc.zone = zone;

		status = compact_zone(zone, &cc);



		if (status == COMPACT_SUCCESS) {