Commit 4d1c6273 authored by Daisuke Nishimura's avatar Daisuke Nishimura Committed by Linus Torvalds
Browse files

memcg: make oom less frequently

In previous implementation, mem_cgroup_try_charge checked the return
value of mem_cgroup_try_to_free_pages, and just retried if some pages
had been reclaimed.
But now, try_charge(and mem_cgroup_hierarchical_reclaim called from it)
only checks whether the usage is less than the limit.

This patch tries to change the behavior as before to cause oom less
Signed-off-by: default avatarDaisuke Nishimura <>
Acked-by: default avatarBalbir Singh <>
Acked-by: default avatarKAMEZAWA Hiroyuki <>
Cc: Pavel Emelyanov <>
Cc: Li Zefan <>
Cc: Paul Menage <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c268e994
......@@ -773,10 +773,10 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
* but there might be left over accounting, even after children
* have left.
ret = try_to_free_mem_cgroup_pages(root_mem, gfp_mask, noswap,
ret += try_to_free_mem_cgroup_pages(root_mem, gfp_mask, noswap,
if (mem_cgroup_check_under_limit(root_mem))
return 0;
return 1; /* indicate reclaim has succeeded */
if (!root_mem->use_hierarchy)
return ret;
......@@ -787,10 +787,10 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
next_mem = mem_cgroup_get_next_node(root_mem);
ret = try_to_free_mem_cgroup_pages(next_mem, gfp_mask, noswap,
ret += try_to_free_mem_cgroup_pages(next_mem, gfp_mask, noswap,
if (mem_cgroup_check_under_limit(root_mem))
return 0;
return 1; /* indicate reclaim has succeeded */
next_mem = mem_cgroup_get_next_node(root_mem);
return ret;
......@@ -875,6 +875,8 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
ret = mem_cgroup_hierarchical_reclaim(mem_over_limit, gfp_mask,
if (ret)
* try_to_free_mem_cgroup_pages() might not give us a full
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment