> > > read_lock(&tasklist_lock);
> > >
> > > + if (sysctl_panic_on_oom == 2)
> > > + panic("out of memory. Compulsory panic_on_oom is selected.\n");
> > > +
> >
> > Wouldn't it be safer to put the panic before the read_lock()?
>
> I agree. Otherwise the patch seem to be okay.
Ok. This is take 2.
Thanks for your comment.
---------
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 not tested yet. But it would work.
Please apply.
Signed-off-by: Yasunori Goto <[EMAIL PROTECTED]>
---
Documentation/sysctl/vm.txt | 23 +++++++++++++++++------
mm/oom_kill.c | 3 +++
2 files changed, 20 insertions(+), 6 deletions(-)
Index: panic_on_oom2/Documentation/sysctl/vm.txt
===================================================================
--- panic_on_oom2.orig/Documentation/sysctl/vm.txt 2007-04-21
12:39:09.000000000 +0900
+++ panic_on_oom2/Documentation/sysctl/vm.txt 2007-04-21 12:39:58.000000000
+0900
@@ -197,11 +197,22 @@
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.
Index: panic_on_oom2/mm/oom_kill.c
===================================================================
--- panic_on_oom2.orig/mm/oom_kill.c 2007-04-21 12:39:09.000000000 +0900
+++ panic_on_oom2/mm/oom_kill.c 2007-04-21 12:40:31.000000000 +0900
@@ -409,6 +409,9 @@
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);
--
Yasunori Goto
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
