The patch titled
mm: fix handling of panic_on_oom when cpusets are in use
has been removed from the -mm tree. Its filename was
mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: mm: fix handling of panic_on_oom when cpusets are in use
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
The current panic_on_oom may not work if there is a process using
cpusets/mempolicy, because other nodes' memory may remain. But some people
want failover by panic ASAP even if they are used. This patch makes new
setting for its request.
This is tested on my ia64 box which has 3 nodes.
Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Signed-off-by: Benjamin LaHaise <bcrl@xxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Paul Jackson <pj@xxxxxxx>
Cc: Ethan Solomita <solo@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/sysctl/vm.txt | 23 +++++++++++++++++------
mm/oom_kill.c | 3 +++
2 files changed, 20 insertions(+), 6 deletions(-)
diff -puN Documentation/sysctl/vm.txt~mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use Documentation/sysctl/vm.txt
--- a/Documentation/sysctl/vm.txt~mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use
+++ a/Documentation/sysctl/vm.txt
@@ -197,11 +197,22 @@ and may not be fast.
panic_on_oom
-This enables or disables panic on out-of-memory feature. If this is set to 1,
-the kernel panics when out-of-memory happens. If this is set to 0, the kernel
-will kill some rogue process, called oom_killer. Usually, oom_killer can kill
-rogue processes and system will survive. If you want to panic the system
-rather than killing rogue processes, set this to 1.
+This enables or disables panic on out-of-memory feature.
-The default value is 0.
+If this is set to 0, the kernel will kill some rogue process,
+called oom_killer. Usually, oom_killer can kill rogue processes and
+system will survive.
+
+If this is set to 1, the kernel panics when out-of-memory happens.
+However, if a process limits using nodes by mempolicy/cpusets,
+and those nodes become memory exhaustion status, one process
+may be killed by oom-killer. No panic occurs in this case.
+Because other nodes' memory may be free. This means system total status
+may be not fatal yet.
+If this is set to 2, the kernel panics compulsorily even on the
+above-mentioned.
+
+The default value is 0.
+1 and 2 are for failover of clustering. Please select either
+according to your policy of failover.
diff -puN mm/oom_kill.c~mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use mm/oom_kill.c
--- a/mm/oom_kill.c~mm-fix-handling-of-panic_on_oom-when-cpusets-are-in-use
+++ a/mm/oom_kill.c
@@ -413,6 +413,9 @@ void out_of_memory(struct zonelist *zone
show_mem();
}
+ if (sysctl_panic_on_oom == 2)
+ panic("out of memory. Compulsory panic_on_oom is selected.\n");
+
cpuset_lock();
read_lock(&tasklist_lock);
_
Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are
origin.patch
move-free-pages-between-lists-on-steal.patch
handle-kernelcore=-generic.patch
fix-section-mismatch-of-memory-hotplug-related-code.patch
add-white-list-into-modpostc-for-memory-hotplug-code-and-ia64s-machvec-section.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
