mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
To: "Luis Claudio R. Goncalves" <lclaudio@uudg.org>,
	LKML <linux-kernel@vger.kernel.org>,
	linux-mm <linux-mm@kvack.org>, Oleg Nesterov <oleg@redhat.com>,
	David Rientjes <rientjes@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Nick Piggin <npiggin@suse.de>
Cc: kosaki.motohiro@jp.fujitsu.com
Subject: [PATCH 09/12] oom: remove PF_EXITING check completely
Date: Thu,  3 Jun 2010 15:25:18 +0900 (JST)	[thread overview]
Message-ID: <20100603152436.7262.A69D9226@jp.fujitsu.com> (raw)
In-Reply-To: <20100603135106.7247.A69D9226@jp.fujitsu.com>

Currently, PF_EXITING check is completely broken. because 1) It only
care main-thread and ignore sub-threads 2) If user enable core-dump
feature, it can makes deadlock because the task during coredump ignore
SIGKILL.

The deadlock is certenaly worst result, then, minor PF_EXITING
optimization worth is relatively ignorable.

This patch removes it.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
---
 mm/oom_kill.c |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 6360c56..5d723fb 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -302,24 +302,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 		if (test_tsk_thread_flag(p, TIF_MEMDIE))
 			return ERR_PTR(-1UL);
 
-		/*
-		 * This is in the process of releasing memory so wait for it
-		 * to finish before killing some other task by mistake.
-		 *
-		 * However, if p is the current task, we allow the 'kill' to
-		 * go ahead if it is exiting: this will simply set TIF_MEMDIE,
-		 * which will allow it to gain access to memory reserves in
-		 * the process of exiting and releasing its resources.
-		 * Otherwise we could get an easy OOM deadlock.
-		 */
-		if (p->flags & PF_EXITING) {
-			if (p != current)
-				return ERR_PTR(-1UL);
-
-			chosen = p;
-			*ppoints = ULONG_MAX;
-		}
-
 		points = badness(p, uptime.tv_sec);
 		if (points > *ppoints || !chosen) {
 			chosen = p;
@@ -444,15 +426,6 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 	if (printk_ratelimit())
 		dump_header(p, gfp_mask, order, mem);
 
-	/*
-	 * If the task is already exiting, don't alarm the sysadmin or kill
-	 * its children or threads, just set TIF_MEMDIE so it can die quickly
-	 */
-	if (p->flags & PF_EXITING) {
-		__oom_kill_process(p, mem, 0);
-		return 0;
-	}
-
 	printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
 					message, task_pid_nr(p), p->comm, points);
 
-- 
1.6.5.2




  parent reply	other threads:[~2010-06-03  6:25 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-03  5:48 [mmotm 0521][PATCH 0/12] various OOM fixes for 2.6.35 KOSAKI Motohiro
2010-06-03  5:49 ` [PATCH 01/12] oom: select_bad_process: check PF_KTHREAD instead of !mm to skip kthreads KOSAKI Motohiro
2010-06-03  5:50 ` [PATCH 02/12] oom: introduce find_lock_task_mm() to fix !mm false positives KOSAKI Motohiro
2010-06-03  6:12   ` Minchan Kim
2010-06-03  6:52     ` KOSAKI Motohiro
2010-06-03  5:51 ` [PATCH 03/12] oom: the points calculation of child processes must use find_lock_task_mm() too KOSAKI Motohiro
2010-06-03  6:20   ` Minchan Kim
2010-06-03  5:52 ` [PATCH 04/12] oom: __oom_kill_task() " KOSAKI Motohiro
2010-06-03  5:53 ` [PATCH 05/12] oom: make oom_unkillable() helper function KOSAKI Motohiro
2010-06-03  6:11 ` [mmotm 0521][PATCH 0/12] various OOM fixes for 2.6.35 Minchan Kim
2010-06-03  6:23 ` [PATCH 06/12] oom: remove warning for in mm-less task __oom_kill_process() KOSAKI Motohiro
2010-06-03  6:31   ` KAMEZAWA Hiroyuki
2010-06-03  6:37   ` David Rientjes
2010-06-03  6:23 ` [PATCH 07/12] oom: Fix child process iteration properly KOSAKI Motohiro
2010-06-03  6:33   ` KAMEZAWA Hiroyuki
2010-06-03  6:24 ` [PATCH 08/12] oom: dump_tasks() use find_lock_task_mm() too KOSAKI Motohiro
2010-06-03  6:34   ` KAMEZAWA Hiroyuki
2010-06-03 15:21   ` Oleg Nesterov
2010-06-03 15:26   ` Oleg Nesterov
2010-06-03 20:12     ` David Rientjes
2010-06-03 22:01       ` Oleg Nesterov
2010-06-03 23:18         ` David Rientjes
2010-06-04 10:54     ` [PATCH 13/12] oom: dump_header() need tasklist_lock KOSAKI Motohiro
2010-06-03  6:25 ` KOSAKI Motohiro [this message]
2010-06-03  6:34   ` [PATCH 09/12] oom: remove PF_EXITING check completely David Rientjes
2010-06-03 14:00     ` Oleg Nesterov
2010-06-03 20:26       ` David Rientjes
2010-06-03 22:11         ` Oleg Nesterov
2010-06-03 23:23           ` David Rientjes
2010-06-04 10:04             ` Oleg Nesterov
2010-06-04 10:54     ` KOSAKI Motohiro
2010-06-03  6:36   ` KAMEZAWA Hiroyuki
2010-06-03  6:26 ` [PATCH 10/12] oom: sacrifice child with highest badness score for parent KOSAKI Motohiro
2010-06-03  6:26 ` [PATCH 11/12] oom: remove special handling for pagefault ooms KOSAKI Motohiro
2010-06-03  6:27 ` [PATCH 12/12] oom: give current access to memory reserves if it has been killed KOSAKI Motohiro
2010-06-08 11:41   ` KOSAKI Motohiro
2010-06-08 18:26     ` David Rientjes
2010-06-08 11:41 ` [mmotm 0521][PATCH 0/12] various OOM fixes for 2.6.35 KOSAKI Motohiro
2010-06-08 11:41 ` KOSAKI Motohiro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100603152436.7262.A69D9226@jp.fujitsu.com \
    --to=kosaki.motohiro@jp.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=lclaudio@uudg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=npiggin@suse.de \
    --cc=oleg@redhat.com \
    --cc=rientjes@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®