From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753906AbXDXFPd (ORCPT ); Tue, 24 Apr 2007 01:15:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753732AbXDXFPd (ORCPT ); Tue, 24 Apr 2007 01:15:33 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:37368 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753507AbXDXFPc (ORCPT ); Tue, 24 Apr 2007 01:15:32 -0400 Date: Tue, 24 Apr 2007 14:14:40 +0900 From: Yasunori Goto To: Andrew Morton Subject: Re: [PATCH] Make new setting of panic_on_oom Cc: Christoph Lameter , Linux Kernel ML , Larry Woodman , Benjamin LaHaise In-Reply-To: <20070421152705.GE21709@kvack.org> References: <20070421132543.CA5D.Y-GOTO@jp.fujitsu.com> <20070421152705.GE21709@kvack.org> X-Mailer-Plugin: BkASPil for Becky!2 Ver.2.068 Message-Id: <20070424140750.FD8E.Y-GOTO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.27 [ja] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I tested this patch. It worked well. So, I fixed its description. Please apply. ---------- 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. Please apply. Signed-off-by: Yasunori Goto Signed-off-by: Benjamin LaHaise --- 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