Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

memcg: fix wake up in oom wait queue

OOM-waitqueue should be waken up when oom_disable is canceled. This is a
fix for 3c11ecf448eff8f1 ("memcg: oom kill disable and oom status").

How to test:
Create a cgroup A...
1. set memory.limit and memory.memsw.limit to be small value
2. echo 1 > /cgroup/A/memory.oom_control, this disables oom-kill.
3. run a program which must cause OOM.

A program executed in 3 will sleep by oom_waiqueue in memcg. Then, how to
wake it up is problem.

1. echo 0 > /cgroup/A/memory.oom_control (enable OOM-killer)
2. echo big mem > /cgroup/A/memory.memsw.limit_in_bytes(allow more swap)

etc..

Without the patch, a task in slept can not be waken up.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

KAMEZAWA Hiroyuki and committed by
Linus Torvalds
4d845ebf 3c26c9d9

+3 -1
+3 -1
mm/memcontrol.c
··· 1370 1370 1371 1371 static void memcg_oom_recover(struct mem_cgroup *mem) 1372 1372 { 1373 - if (mem->oom_kill_disable && atomic_read(&mem->oom_lock)) 1373 + if (atomic_read(&mem->oom_lock)) 1374 1374 memcg_wakeup_oom(mem); 1375 1375 } 1376 1376 ··· 3781 3781 return -EINVAL; 3782 3782 } 3783 3783 mem->oom_kill_disable = val; 3784 + if (!val) 3785 + memcg_oom_recover(mem); 3784 3786 cgroup_unlock(); 3785 3787 return 0; 3786 3788 }