Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mm, oom: base root bonus on current usage

Browse source 
A 3% of system memory bonus is sometimes too excessive in comparison to
other processes.

With commit a63d83f427 ("oom: badness heuristic rewrite"), the OOM
killer tries to avoid killing privileged tasks by subtracting 3% of
overall memory (system or cgroup) from their per-task consumption.  But
as a result, all root tasks that consume less than 3% of overall memory
are considered equal, and so it only takes 33+ privileged tasks pushing
the system out of memory for the OOM killer to do something stupid and
kill dhclient or other root-owned processes.  For example, on a 32G
machine it can't tell the difference between the 1M agetty and the 10G
fork bomb member.

The changelog describes this 3% boost as the equivalent to the global
overcommit limit being 3% higher for privileged tasks, but this is not
the same as discounting 3% of overall memory from _every privileged task
individually_ during OOM selection.

Replace the 3% of system memory bonus with a 3% of current memory usage
bonus.

By giving root tasks a bonus that is proportional to their actual size,
they remain comparable even when relatively small.  In the example
above, the OOM killer will discount the 1M agetty's 256 badness points
down to 179, and the 10G fork bomb's 262144 points down to 183500 points
and make the right choice, instead of discounting both to 0 and killing
agetty because it's first in the task list.

Signed-off-by: David Rientjes <rientjes@google.com>
Reported-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Rientjes 2014-01-30 15:46:11 -08:00 committed by Linus Torvalds
parent 24f91eba18
commit 778c14affa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/filesystems/proc.txt
View file

@ -1386,8 +1386,8 @@ may allocate from based on an estimation of its current memory and swap use.
For example, if a task is using all allowed memory, its badness score will be For example, if a task is using all allowed memory, its badness score will be
1000. If it is using half of its allowed memory, its score will be 500. 1000. If it is using half of its allowed memory, its score will be 500.
There is an additional factor included in the badness score: root There is an additional factor included in the badness score: the current memory
processes are given 3% extra memory over other tasks. and swap usage is discounted by 3% for root processes.
The amount of "allowed" memory depends on the context in which the oom killer The amount of "allowed" memory depends on the context in which the oom killer
was called. If it is due to the memory assigned to the allocating task's cpuset was called. If it is due to the memory assigned to the allocating task's cpuset

2
mm/oom_kill.c
View file

@ -178,7 +178,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
* implementation used by LSMs. * implementation used by LSMs.
*/ */
if (has_capability_noaudit(p, CAP_SYS_ADMIN)) if (has_capability_noaudit(p, CAP_SYS_ADMIN))
adj -= 30; points -= (points * 3) / 100;
/* Normalize to oom_score_adj units */ /* Normalize to oom_score_adj units */
adj *= totalpages / 1000; adj *= totalpages / 1000;