Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758733Ab0FPLct (ORCPT ); Wed, 16 Jun 2010 07:32:49 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:50312 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757829Ab0FPLcs (ORCPT ); Wed, 16 Jun 2010 07:32:48 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML , linux-mm , Andrew Morton , David Rientjes , KAMEZAWA Hiroyuki Subject: [PATCH 4/9] oom: oom_kill_process() need to check p is unkillable Cc: kosaki.motohiro@jp.fujitsu.com In-Reply-To: <20100616201948.72D7.A69D9226@jp.fujitsu.com> References: <20100616201948.72D7.A69D9226@jp.fujitsu.com> Message-Id: <20100616203212.72E0.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Wed, 16 Jun 2010 20:32:45 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1248 Lines: 42 When oom_kill_allocating_task is enabled, an argument of oom_kill_process is not selected by select_bad_process(), but just out_of_memory() caller task. It mean the task can be unkillable. check it first. Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 6ca6cb8..3e48023 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -436,6 +436,17 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, unsigned long victim_points = 0; struct timespec uptime; + /* + * When oom_kill_allocating_task is enabled, p can be + * unkillable. check it first. + */ + if (is_global_init(p) || (p->flags & PF_KTHREAD)) + return 1; + if (mem && !task_in_mem_cgroup(p, mem)) + return 1; + if (!has_intersects_mems_allowed(p, nodemask)) + return 1; + if (printk_ratelimit()) dump_header(p, gfp_mask, order, mem); -- 1.6.5.2 -- 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/