From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail172.messagelabs.com (mail172.messagelabs.com [216.82.254.3]) by kanga.kvack.org (Postfix) with ESMTP id DA40D6B0136 for ; Wed, 13 May 2009 18:46:56 -0400 (EDT) Date: Wed, 13 May 2009 15:47:26 -0700 From: Andrew Morton Subject: Re: [PATCH 3/6] mm, PM/Freezer: Disable OOM killer when tasks are frozen Message-Id: <20090513154726.0786a27d.akpm@linux-foundation.org> In-Reply-To: References: <200905070040.08561.rjw@sisk.pl> <200905101548.57557.rjw@sisk.pl> <200905131032.53624.rjw@sisk.pl> <200905131037.50011.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: David Rientjes Cc: rjw@sisk.pl, linux-pm@lists.linux-foundation.org, fengguang.wu@intel.com, linux-kernel@vger.kernel.org, pavel@ucw.cz, nigel@tuxonice.net, linux-mm@kvack.org List-ID: On Wed, 13 May 2009 15:35:32 -0700 (PDT) David Rientjes wrote: > On Wed, 13 May 2009, Rafael J. Wysocki wrote: > > > Index: linux-2.6/mm/page_alloc.c > > =================================================================== > > --- linux-2.6.orig/mm/page_alloc.c > > +++ linux-2.6/mm/page_alloc.c > > @@ -175,6 +175,8 @@ static void set_pageblock_migratetype(st > > PB_migrate, PB_migrate_end); > > } > > > > +bool oom_killer_disabled __read_mostly; > > + > > #ifdef CONFIG_DEBUG_VM > > static int page_outside_zone_boundaries(struct zone *zone, struct page *page) > > { > > @@ -1600,6 +1602,9 @@ nofail_alloc: > > if (page) > > goto got_pg; > > } else if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) { > > + if (oom_killer_disabled) > > + goto nopage; > > + > > if (!try_set_zone_oom(zonelist, gfp_mask)) { > > schedule_timeout_uninterruptible(1); > > goto restart; > > This allows __GFP_NOFAIL allocations to fail. I think that's OK - oom_killer_disable() and __GFP_NOFAIL are fundamentally incompatible, and __GFP_NOFAIL is a crock. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org