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

Commit 42e9abb6 authored by Daisuke Nishimura's avatar Daisuke Nishimura Committed by Linus Torvalds
Browse files

memcg: change try_to_free_pages to hierarchical_reclaim 



mem_cgroup_hierarchicl_reclaim() works properly even when !use_hierarchy
now (by memcg-hierarchy-avoid-unnecessary-reclaim.patch), so, instead of
try_to_free_mem_cgroup_pages(), it should be used in many cases.

The only exception is force_empty.  The group has no children in this
case.

Signed-off-by: default avatarDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f4d454d

mm/memcontrol.c

+4 −8
Original line number Diff line number Diff line
@@ -1430,8 +1430,7 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask) 
	rcu_read_unlock();



	do {

		progress = try_to_free_mem_cgroup_pages(mem, gfp_mask, true,

							get_swappiness(mem));

		progress = mem_cgroup_hierarchical_reclaim(mem, gfp_mask, true);

		progress += mem_cgroup_check_under_limit(mem);

	} while (!progress && --retry);
@@ -1475,10 +1474,8 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, 
		if (!ret)

			break;



		progress = try_to_free_mem_cgroup_pages(memcg,

							GFP_KERNEL,

							false,

							get_swappiness(memcg));

		progress = mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL,

							   false);

  		if (!progress)			retry_count--;

	}
@@ -1519,8 +1516,7 @@ int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg, 
			break;



		oldusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);

		try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL, true,

					     get_swappiness(memcg));

		mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, true);

		curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);

		if (curusage >= oldusage)

			retry_count--;