Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1235160

[PATCH -mm 2/3] mm/oom_kill: cleanup the "kill sharing same memory"

Show all headers | View raw

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 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 0d581c6..8e7bed2 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -583,16 +583,20 @@ 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 (unlikely(p->flags & PF_KTHREAD))
+			continue;
+		if (same_thread_group(p, victim))
+			continue;
+		if (p->mm != mm)
+			continue;
+		if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
+			continue;
 
-			pr_info("Kill process %d (%s) sharing same memory\n",
-				task_pid_nr(p), p->comm);
-			do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
-		}
+		pr_info("Kill process %d (%s) sharing same memory\n",
+			task_pid_nr(p), p->comm);
+		do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
+	}
 	rcu_read_unlock();
 
 	mmput(mm);
-- 
2.4.3

--
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH -mm 0/3] mm/oom_kill: ensure we actually kill all tasks  sharing the same mm Oleg Nesterov <oleg@redhat.com> - 2015-09-29 16:30 +0200
  [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm checks in Oleg Nesterov <oleg@redhat.com> - 2015-09-29 16:30 +0200
    Re: [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm checks  in David Rientjes <rientjes@google.com> - 2015-09-30 00:50 +0200
      Re: [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm  checks in Oleg Nesterov <oleg@redhat.com> - 2015-09-30 16:00 +0200
    Re: [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm checks in Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> - 2015-09-30 04:20 +0200
      Re: [PATCH -mm 3/3] mm/oom_kill: fix the wrong task->mm == mm  checks in Oleg Nesterov <oleg@redhat.com> - 2015-09-30 16:10 +0200
  [PATCH -mm 2/3] mm/oom_kill: cleanup the "kill sharing same memory" Oleg Nesterov <oleg@redhat.com> - 2015-09-29 16:30 +0200
    Re: [PATCH -mm 2/3] mm/oom_kill: cleanup the "kill sharing same  memory" David Rientjes <rientjes@google.com> - 2015-09-30 00:40 +0200
      Re: [PATCH -mm 2/3] mm/oom_kill: cleanup the "kill sharing same  memory" Oleg Nesterov <oleg@redhat.com> - 2015-09-30 16:00 +0200
  [PATCH -mm v2 0/3] mm/oom_kill: ensure we actually kill all tasks  sharing the same mm Oleg Nesterov <oleg@redhat.com> - 2015-09-30 20:30 +0200

csiph-web