Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753814Ab2FJXwy (ORCPT ); Sun, 10 Jun 2012 19:52:54 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47337 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951Ab2FJXwx (ORCPT ); Sun, 10 Jun 2012 19:52:53 -0400 Date: Sun, 10 Jun 2012 16:52:50 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Dave Jones , KOSAKI Motohiro , Linux Kernel , linux-mm@kvack.org Subject: Re: oomkillers gone wild. In-Reply-To: <20120610201055.GA27662@redhat.com> Message-ID: References: <20120604152710.GA1710@redhat.com> <20120605174454.GA23867@redhat.com> <20120608210330.GA21010@redhat.com> <4FD412CB.9060809@gmail.com> <20120610201055.GA27662@redhat.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1914 Lines: 62 On Sun, 10 Jun 2012, Dave Jones wrote: > To double check, here it is in rc2 (which has that patch).. > > $ uname -r > 3.5.0-rc2+ > $ cat /proc/$(pidof dbus-daemon)/oom_score{_adj,} > -900 > 7441500919753 > $ grep RSS /proc/$(pidof dbus-daemon)/status > VmRSS: 1604 kB Eek, yes, that's definitely wrong. The following should fix it. --- mm/oom_kill.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -184,6 +184,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, const nodemask_t *nodemask, unsigned long totalpages) { long points; + long adj; if (oom_unkillable_task(p, memcg, nodemask)) return 0; @@ -192,7 +193,8 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, if (!p) return 0; - if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) { + adj = p->signal->oom_score_adj; + if (adj == OOM_SCORE_ADJ_MIN) { task_unlock(p); return 0; } @@ -210,14 +212,11 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, * implementation used by LSMs. */ if (has_capability_noaudit(p, CAP_SYS_ADMIN)) - points -= 30 * totalpages / 1000; + adj -= 30; - /* - * /proc/pid/oom_score_adj ranges from -1000 to +1000 such that it may - * either completely disable oom killing or always prefer a certain - * task. - */ - points += p->signal->oom_score_adj * totalpages / 1000; + /* Normalize to oom_score_adj units */ + adj *= totalpages / 1000; + points += adj; /* * Never return 0 for an eligible task regardless of the root bonus and -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/