Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef419398 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

proc_oom_score: remove tasklist_lock and pid_alive() 

This was needed before to ensure that ->signal != 0 and do_each_thread()
is safe, see commit b95c35e7 ("oom: fix the unsafe usage of
badness() in proc_oom_score()") for details.

Today tsk->signal can't go away and for_each_thread(tsk) is always safe.

Link: http://lkml.kernel.org/r/20160608211921.GA15508@redhat.com


Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent db4ad036

fs/proc/base.c

+2 −5
Original line number Diff line number Diff line
@@ -579,11 +579,8 @@ static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns, 
	unsigned long totalpages = totalram_pages + total_swap_pages;

	unsigned long points = 0;



	read_lock(&tasklist_lock);

	if (pid_alive(task))

	points = oom_badness(task, NULL, NULL, totalpages) *

					1000 / totalpages;

	read_unlock(&tasklist_lock);

	seq_printf(m, "%lu\n", points);



	return 0;