From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754887Ab0F3J30 (ORCPT ); Wed, 30 Jun 2010 05:29:26 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:59861 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754673Ab0F3J3Z (ORCPT ); Wed, 30 Jun 2010 05:29:25 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML , linux-mm , Andrew Morton , Minchan Kim , David Rientjes , KAMEZAWA Hiroyuki Subject: [PATCH 04/11] oom: oom_kill_process() need to check p is unkillable Cc: kosaki.motohiro@jp.fujitsu.com In-Reply-To: <20100630172430.AA42.A69D9226@jp.fujitsu.com> References: <20100630172430.AA42.A69D9226@jp.fujitsu.com> Message-Id: <20100630182838.AA53.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, 30 Jun 2010 18:29:22 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When oom_kill_allocating_task is enabled, an argument task of oom_kill_process is not selected by select_bad_process(), It's 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 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index a4a5439..ee00817 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -687,7 +687,8 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, check_panic_on_oom(constraint, gfp_mask, order); read_lock(&tasklist_lock); - if (sysctl_oom_kill_allocating_task) { + if (sysctl_oom_kill_allocating_task && + !oom_unkillable_task(current, NULL, nodemask)) { /* * oom_kill_process() needs tasklist_lock held. If it returns * non-zero, current could not be killed so we must fallback to -- 1.6.5.2