summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorJan-Frode Myklebust <mykleb@no.ibm.com>2006-09-29 01:59:45 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:10 -0700
commitd7ff0dbf45ee8a7c4802ff46844e6e8167b7f360 (patch)
tree42a5f6bd33a5decb8c3a0bb6ad8fcce3120b7e56 /Documentation/filesystems
parentdb630637b2f192bea2ba1c000e9cbe4e542a03ea (diff)
downloadblackbird-op-linux-d7ff0dbf45ee8a7c4802ff46844e6e8167b7f360.tar.gz
blackbird-op-linux-d7ff0dbf45ee8a7c4802ff46844e6e8167b7f360.zip
[PATCH] oom_adj/oom_score documentation
I was looking for the a way around an OOM-problem, and found a couple of undocumented new features for tuning the OOM-score of individual processes. Here's a small documentation patch for /proc/<pid>/oom_adj and /proc/<pid>/oom_score. Signed-off-by: Jan-Frode Myklebust <mykleb@no.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/proc.txt18
1 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 7db71d6fba82..7240ee7515de 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -39,6 +39,8 @@ Table of Contents
2.9 Appletalk
2.10 IPX
2.11 /proc/sys/fs/mqueue - POSIX message queues filesystem
+ 2.12 /proc/<pid>/oom_adj - Adjust the oom-killer score
+ 2.13 /proc/<pid>/oom_score - Display current oom-killer score
------------------------------------------------------------------------------
Preface
@@ -1962,6 +1964,22 @@ a queue must be less or equal then msg_max.
maximum message size value (it is every message queue's attribute set during
its creation).
+2.12 /proc/<pid>/oom_adj - Adjust the oom-killer score
+------------------------------------------------------
+
+This file can be used to adjust the score used to select which processes
+should be killed in an out-of-memory situation. Giving it a high score will
+increase the likelihood of this process being killed by the oom-killer. Valid
+values are in the range -16 to +15, plus the special value -17, which disables
+oom-killing altogether for this process.
+
+2.13 /proc/<pid>/oom_score - Display current oom-killer score
+-------------------------------------------------------------
+
+------------------------------------------------------------------------------
+This file can be used to check the current score used by the oom-killer is for
+any given <pid>. Use it together with /proc/<pid>/oom_adj to tune which
+process should be killed in an out-of-memory situation.
------------------------------------------------------------------------------
Summary
OpenPOWER on IntegriCloud