linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] oom_kill: oom_score_adj broken for processes with small memory usage
@ 2021-07-01 12:54 minyard
  2021-07-16  5:19 ` Michal Hocko
  0 siblings, 1 reply; 6+ messages in thread
From: minyard @ 2021-07-01 12:54 UTC (permalink / raw)
  To: Andrew Morton, linux-mm; +Cc: linux-kernel, Corey Minyard

From: Corey Minyard <cminyard@mvista.com>

If you have a process with less than 1000 totalpages, the calculation:

  adj = (long)p->signal->oom_score_adj;
  ...
  adj *= totalpages / 1000;

will always result in adj being zero no matter what oom_score_adj is,
which could result in the wrong process being picked for killing.

Fix by adding 1000 to totalpages before dividing.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
I ran across this trying to diagnose another problem where I set up a
cgroup with a small amount of memory and couldn't get a test program to
work right.

I'm not sure this is quite right, to keep closer to the current behavior
you could do:

	if (totalpages >= 1000)
		adj *= totalpages / 1000;

but that would map 0-1999 to the same value.  But this at least shows
the issue.  I can provide a test program the shows the issue, but I
think it's pretty obvious from the code.

 mm/oom_kill.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index eefd3f5fde46..4ae0b6193bcd 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -233,8 +233,11 @@ long oom_badness(struct task_struct *p, unsigned long totalpages)
 		mm_pgtables_bytes(p->mm) / PAGE_SIZE;
 	task_unlock(p);
 
-	/* Normalize to oom_score_adj units */
-	adj *= totalpages / 1000;
+	/*
+	 * Normalize to oom_score_adj units.  You should never
+	 * multiply by zero here, or oom_score_adj will not work.
+	 */
+	adj *= (totalpages + 1000) / 1000;
 	points += adj;
 
 	return points;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-09-03  7:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-01 12:54 [PATCH] oom_kill: oom_score_adj broken for processes with small memory usage minyard
2021-07-16  5:19 ` Michal Hocko
2021-07-16 12:25   ` Corey Minyard
2021-09-02 19:55     ` Andrew Morton
2021-09-03  1:52       ` Corey Minyard
2021-09-03  7:49       ` Michal Hocko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).