summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2011-03-14 20:05:30 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-14 21:38:35 +0100
commitdc1b83ab08f1954335692cdcd499f78c94f4c42a (patch)
treee05f9760a40c2560e500762b13ef81b37f153b9d
parentMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
downloadlinux-dc1b83ab08f1954335692cdcd499f78c94f4c42a.tar.xz
linux-dc1b83ab08f1954335692cdcd499f78c94f4c42a.zip
oom: oom_kill_process: fix the child_points logic
oom_kill_process() starts with victim_points == 0. This means that (most likely) any child has more points and can be killed erroneously. Also, "children has a different mm" doesn't match the reality, we should check child->mm != t->mm. This check is not exactly correct if t->mm == NULL but this doesn't really matter, oom_kill_task() will kill them anyway. Note: "Kill all processes sharing p->mm" in oom_kill_task() is wrong too. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/oom_kill.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 7dcca55ede7c..b19c78eb74c0 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -458,10 +458,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
struct mem_cgroup *mem, nodemask_t *nodemask,
const char *message)
{
- struct task_struct *victim = p;
+ struct task_struct *victim;
struct task_struct *child;
- struct task_struct *t = p;
- unsigned int victim_points = 0;
+ struct task_struct *t;
+ unsigned int victim_points;
if (printk_ratelimit())
dump_header(p, gfp_mask, order, mem, nodemask);
@@ -487,10 +487,15 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
* parent. This attempts to lose the minimal amount of work done while
* still freeing memory.
*/
+ victim_points = oom_badness(p, mem, nodemask, totalpages);
+ victim = p;
+ t = p;
do {
list_for_each_entry(child, &t->children, sibling) {
unsigned int child_points;
+ if (child->mm == t->mm)
+ continue;
/*
* oom_badness() returns 0 if the thread is unkillable
*/