Commit bc53008e authored by Wei Yang's avatar Wei Yang Committed by Andrew Morton
Browse files

mm/vmscan: make sure wakeup_kswapd with managed zone 

wakeup_kswapd() only wake up kswapd when the zone is managed.

For two callers of wakeup_kswapd(), they are node perspective.

  * wake_all_kswapds
  * numamigrate_isolate_page

If we picked up a !managed zone, this is not we expected.

This patch makes sure we pick up a managed zone for wakeup_kswapd().  And
it also use managed_zone in migrate_balanced_pgdat() to get the proper
zone.

[richard.weiyang@gmail.com: adjust the usage in migrate_balanced_pgdat()]
  Link: https://lkml.kernel.org/r/20220329010901.1654-2-richard.weiyang@gmail.com
Link: https://lkml.kernel.org/r/20220327024101.10378-2-richard.weiyang@gmail.com


Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Reviewed-by: default avatar"Huang, Ying" <ying.huang@intel.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 36c26128

mm/migrate.c

+3 −3
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, 
#ifdef CONFIG_NUMA_BALANCING

/*

 * Returns true if this is a safe migration target node for misplaced NUMA

 * pages. Currently it only checks the watermarks which crude

 * pages. Currently it only checks the watermarks which is crude.

 */

static bool migrate_balanced_pgdat(struct pglist_data *pgdat,

				   unsigned long nr_migrate_pages)
@@ -1979,7 +1979,7 @@ static bool migrate_balanced_pgdat(struct pglist_data *pgdat, 
	for (z = pgdat->nr_zones - 1; z >= 0; z--) {

		struct zone *zone = pgdat->node_zones + z;



		if (!populated_zone(zone))

		if (!managed_zone(zone))

			continue;



		/* Avoid waking kswapd by allocating pages_to_migrate pages. */
@@ -2032,7 +2032,7 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) 
		if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING))

			return 0;

		for (z = pgdat->nr_zones - 1; z >= 0; z--) {

			if (populated_zone(pgdat->node_zones + z))

			if (managed_zone(pgdat->node_zones + z))

				break;

		}

		wakeup_kswapd(pgdat->node_zones + z, 0, order, ZONE_MOVABLE);

mm/page_alloc.c

+2 −0
Original line number Diff line number Diff line
@@ -4629,6 +4629,8 @@ static void wake_all_kswapds(unsigned int order, gfp_t gfp_mask, 


	for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, highest_zoneidx,

					ac->nodemask) {

		if (!managed_zone(zone))

			continue;

		if (last_pgdat != zone->zone_pgdat)

			wakeup_kswapd(zone, gfp_mask, order, highest_zoneidx);

		last_pgdat = zone->zone_pgdat;