From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with SMTP id B24958D003A for ; Mon, 14 Mar 2011 15:46:29 -0400 (EDT) Date: Mon, 14 Mar 2011 20:05:08 +0100 From: Oleg Nesterov Subject: [PATCH 2/3 for 2.6.38] oom: select_bad_process: ignore TIF_MEMDIE zombies Message-ID: <20110314190508.GC21845@redhat.com> References: <20110303100030.B936.A69D9226@jp.fujitsu.com> <20110308134233.GA26884@redhat.com> <20110309151946.dea51cde.akpm@linux-foundation.org> <20110312123413.GA18351@redhat.com> <20110312134341.GA27275@redhat.com> <20110313212726.GA24530@redhat.com> <20110314190419.GA21845@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110314190419.GA21845@redhat.com> Sender: owner-linux-mm@kvack.org List-ID: To: Hugh Dickins , Linus Torvalds Cc: Andrew Morton , KOSAKI Motohiro , KAMEZAWA Hiroyuki , Andrey Vagin , David Rientjes , Frantisek Hrbata , linux-mm@kvack.org, linux-kernel@vger.kernel.org select_bad_process() assumes that a TIF_MEMDIE process should go away. But it can only go away it its parent does wait(). Change this check to ignore the TIF_MEMDIE zombies. Note: this is _not_ enough. Just a minimal fix. Signed-off-by: Oleg Nesterov --- mm/oom_kill.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- 38/mm/oom_kill.c~2_tif_memdie_zombie 2011-03-14 18:51:49.000000000 +0100 +++ 38/mm/oom_kill.c 2011-03-14 18:52:39.000000000 +0100 @@ -311,7 +311,8 @@ static struct task_struct *select_bad_pr * blocked waiting for another task which itself is waiting * for memory. Is there a better alternative? */ - if (test_tsk_thread_flag(p, TIF_MEMDIE)) + if (test_tsk_thread_flag(p, TIF_MEMDIE) && + !p->exit_state && thread_group_empty(p)) return ERR_PTR(-1UL); /* -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org