summaryrefslogtreecommitdiff
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorPavel Emelianov <xemul@openvz.org>2008-02-07 00:13:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 08:42:19 -0800
commitc7ba5c9e8176704bfac0729875fa62798037584d (patch)
tree00df1c4cb67e313cdb66233381b4cee275fd46c0 /mm/memcontrol.c
parent0eea10301708c64a6b793894c156e21ddd15eb64 (diff)
downloadlinux-3.10-c7ba5c9e8176704bfac0729875fa62798037584d.tar.gz
linux-3.10-c7ba5c9e8176704bfac0729875fa62798037584d.tar.bz2
linux-3.10-c7ba5c9e8176704bfac0729875fa62798037584d.zip
Memory controller: OOM handling
Out of memory handling for cgroups over their limit. A task from the cgroup over limit is chosen using the existing OOM logic and killed. TODO: 1. As discussed in the OLS BOF session, consider implementing a user space policy for OOM handling. [akpm@linux-foundation.org: fix build due to oom-killer changes] Signed-off-by: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Paul Menage <menage@google.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Kirill Korotaev <dev@sw.ru> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: David Rientjes <rientjes@google.com> Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d73692279ab..5260658c90a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -329,6 +329,7 @@ retry:
}
css_put(&mem->css);
+ mem_cgroup_out_of_memory(mem, GFP_KERNEL);
goto free_pc;
}