All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: David Rientjes <rientjes@google.com>,
	Kyle Walker <kwalker@redhat.com>,
	Michal Hocko <mhocko@kernel.org>,
	Stanislav Kozina <skozina@redhat.com>,
	Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
	linux-kernel@vger.kernel.org
Subject: [PATCH -mm v2 2/3] mm/oom_kill: cleanup the "kill sharing same memory" loop
Date: Wed, 30 Sep 2015 20:24:08 +0200	[thread overview]
Message-ID: <20150930182408.GA15247@redhat.com> (raw)
In-Reply-To: <20150930182341.GA15047@redhat.com>

Purely cosmetic, but the complex "if" condition looks annoying to me.
Especially because it is not consistent with OOM_SCORE_ADJ_MIN check
which adds another if/continue.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 mm/oom_kill.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b6b8c78..c189ee5 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -583,14 +583,18 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
 	 * pending fatal signal.
 	 */
 	rcu_read_lock();
-	for_each_process(p)
-		if (p->mm == mm && !same_thread_group(p, victim) &&
-		    !(p->flags & PF_KTHREAD)) {
-			if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
-				continue;
+	for_each_process(p) {
+		if (p->mm != mm)
+			continue;
+		if (same_thread_group(p, victim))
+			continue;
+		if (unlikely(p->flags & PF_KTHREAD))
+			continue;
+		if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
+			continue;
 
-			do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
-		}
+		do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
+	}
 	rcu_read_unlock();
 
 	mmput(mm);
-- 
2.4.3


  parent reply	other threads:[~2015-09-30 18:27 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-29 14:17 [PATCH -mm 0/3] mm/oom_kill: ensure we actually kill all tasks sharing the same mm Oleg Nesterov
2015-09-29 14:18 ` [PATCH -mm 1/3] mm/oom_kill: remove the wrong fatal_signal_pending() Oleg Nesterov
2015-09-29 22:36   ` David Rientjes
2015-09-30  1:42     ` Tetsuo Handa
2015-09-30 13:47       ` Oleg Nesterov
2015-09-30 15:20         ` [PATCH -mm 1/3] mm/oom_kill: remove the wrongfatal_signal_pending() Tetsuo Handa
2015-09-30 13:43     ` [PATCH -mm 1/3] mm/oom_kill: remove the wrong fatal_signal_pending() Oleg Nesterov
2015-09-29 14:18 ` [PATCH -mm 2/3] mm/oom_kill: cleanup the "kill sharing same memory" Oleg Nesterov
2015-09-29 22:39   ` David Rientjes
2015-09-30 13:49     ` Oleg Nesterov
2015-09-29 14:18 ` [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm checks in Oleg Nesterov
2015-09-29 22:41   ` David Rientjes
2015-09-30 13:50     ` Oleg Nesterov
2015-09-30  2:16   ` Tetsuo Handa
2015-09-30 13:59     ` Oleg Nesterov
2015-09-30 18:23 ` [PATCH -mm v2 0/3] mm/oom_kill: ensure we actually kill all tasks sharing the same mm Oleg Nesterov
2015-09-30 18:24   ` [PATCH -mm v2 1/3] mm/oom_kill: remove the wrong fatal_signal_pending() check in oom_kill_process() Oleg Nesterov
2015-09-30 21:14     ` David Rientjes
2015-10-01 10:52       ` [PATCH -mm v2 1/3] mm/oom_kill: remove the wrong fatal_signal_pending()check " Tetsuo Handa
2015-10-01 12:49     ` [PATCH -mm v2 1/3] mm/oom_kill: remove the wrong fatal_signal_pending() check " Michal Hocko
2015-10-01 15:00       ` Oleg Nesterov
2015-10-01 15:27         ` Michal Hocko
2015-10-01 15:41           ` Oleg Nesterov
2015-10-01 16:19             ` Michal Hocko
2015-10-01 17:53               ` Oleg Nesterov
2015-10-02 11:32                 ` Tetsuo Handa
2015-10-02 12:11                   ` Michal Hocko
2015-10-02 12:33                     ` Tetsuo Handa
2015-10-02 13:32                       ` Michal Hocko
2015-10-02 13:57                         ` Oleg Nesterov
2015-10-02 14:24                           ` Michal Hocko
2015-10-02 14:07                         ` Tetsuo Handa
2015-10-02 14:15                           ` Oleg Nesterov
2015-10-02 13:52                   ` Oleg Nesterov
2015-10-02 14:36                     ` Tetsuo Handa
2015-09-30 18:24   ` Oleg Nesterov [this message]
2015-09-30 21:15     ` [PATCH -mm v2 2/3] mm/oom_kill: cleanup the "kill sharing same memory" loop David Rientjes
2015-10-01 12:50     ` Michal Hocko
2015-09-30 18:24   ` [PATCH -mm v2 3/3] mm/oom_kill: fix the wrong task->mm == mm checks in oom_kill_process() Oleg Nesterov
2015-09-30 21:15     ` David Rientjes
2015-10-01 12:56     ` Michal Hocko
2015-10-01 22:24     ` Andrew Morton
     [not found] <04db01d10192$615ef0c0$241cd240$@alibaba-inc.com>
2015-10-08  6:43 ` [PATCH -mm v2 2/3] mm/oom_kill: cleanup the "kill sharing same memory" loop Hillf Danton

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=20150930182408.GA15247@redhat.com \
    --to=oleg@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=kwalker@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhocko@kernel.org \
    --cc=penguin-kernel@I-love.SAKURA.ne.jp \
    --cc=rientjes@google.com \
    --cc=skozina@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.