diff options
| author | Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> | 2011-07-26 16:08:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:41 -0700 |
| commit | a6f0411fbde8a3677fc3e0843db68ca031fa727c (patch) | |
| tree | 09988678715828e045c0b3dfac6f33ee52698d38 | |
| parent | ea530dbfb61aef022d468b597ce13c32da2fb944 (diff) | |
| download | kernel_samsung_smdk4412-a6f0411fbde8a3677fc3e0843db68ca031fa727c.zip kernel_samsung_smdk4412-a6f0411fbde8a3677fc3e0843db68ca031fa727c.tar.gz kernel_samsung_smdk4412-a6f0411fbde8a3677fc3e0843db68ca031fa727c.tar.bz2 | |
memcg: fix behavior of mem_cgroup_resize_limit()
commit 108b6a78463bb8c7163e4f9779f36ad8bbade334 upstream.
Commit 22a668d7c3ef ("memcg: fix behavior under memory.limit equals to
memsw.limit") introduced "memsw_is_minimum" flag, which becomes true
when mem_limit == memsw_limit. The flag is checked at the beginning of
reclaim, and "noswap" is set if the flag is true, because using swap is
meaningless in this case.
This works well in most cases, but when we try to shrink mem_limit,
which is the same as memsw_limit now, we might fail to shrink mem_limit
because swap doesn't used.
This patch fixes this behavior by:
- check MEM_CGROUP_RECLAIM_SHRINK at the begining of reclaim
- If it is set, don't set "noswap" flag even if memsw_is_minimum is true.
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <bsingharora@gmail.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e013b8e..59ac5d6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1730,7 +1730,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT; /* If memsw_is_minimum==1, swap-out is of-no-use. */ - if (!check_soft && root_mem->memsw_is_minimum) + if (!check_soft && !shrink && root_mem->memsw_is_minimum) noswap = true; while (1) { |