From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754866Ab0DBVW3 (ORCPT ); Fri, 2 Apr 2010 17:22:29 -0400 Received: from smtp-out.google.com ([216.239.44.51]:43388 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754779Ab0DBVWY (ORCPT ); Fri, 2 Apr 2010 17:22:24 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id: references:user-agent:mime-version:content-type:x-system-of-record; b=HgOhBZGl5z8v7s0PoubpQSgKuqTalQn3WUHb5RdMN+tNsEDrbdJl4v2cvsTkMc/kc 8aa8O+cgx4BvBU28q1RPg== Date: Fri, 2 Apr 2010 14:22:16 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Andrew Morton cc: Oleg Nesterov , anfei , KOSAKI Motohiro , nishimura@mxp.nes.nec.co.jp, KAMEZAWA Hiroyuki , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch -mm v2] oom: exclude tasks with badness score of 0 from being selected In-Reply-To: <20100402210459.GA5112@redhat.com> Message-ID: References: <20100331175836.GA11635@redhat.com> <20100331204718.GD11635@redhat.com> <20100401135927.GA12460@redhat.com> <20100402111406.GA4432@redhat.com> <20100402191414.GA982@redhat.com> <20100402210459.GA5112@redhat.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An oom_badness() score of 0 means "never kill" according to Documentation/filesystems/proc.txt, so exclude it from being selected for kill. These tasks have either detached their p->mm or are set to OOM_DISABLE. Also removes an unnecessary initialization of points to 0 in mem_cgroup_out_of_memory(), select_bad_process() does this already. Cc: KAMEZAWA Hiroyuki Signed-off-by: David Rientjes --- mm/oom_kill.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -326,17 +326,8 @@ static struct task_struct *select_bad_process(unsigned int *ppoints, *ppoints = 1000; } - /* - * skip kernel threads and tasks which have already released - * their mm. - */ - if (!p->mm) - continue; - if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) - continue; - points = oom_badness(p, totalpages); - if (points > *ppoints || !chosen) { + if (points > *ppoints) { chosen = p; *ppoints = points; } @@ -478,7 +469,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask) { unsigned long limit; - unsigned int points = 0; + unsigned int points; struct task_struct *p; if (sysctl_panic_on_oom == 2)