From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756120AbZEDPDU (ORCPT ); Mon, 4 May 2009 11:03:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751631AbZEDPDH (ORCPT ); Mon, 4 May 2009 11:03:07 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:42186 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751207AbZEDPDG (ORCPT ); Mon, 4 May 2009 11:03:06 -0400 From: "Rafael J. Wysocki" To: David Rientjes Subject: Re: [PATCH 1/5] mm: Add __GFP_NO_OOM_KILL flag Date: Mon, 4 May 2009 17:02:22 +0200 User-Agent: KMail/1.11.2 (Linux/2.6.30-rc4-rjw; KDE/4.2.2; x86_64; ; ) Cc: Wu Fengguang , linux-pm@lists.linux-foundation.org, Andrew Morton , pavel@ucw.cz, torvalds@linux-foundation.org, jens.axboe@oracle.com, alan-jenkins@tuffmail.co.uk, linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org References: <200905040210.10153.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200905041702.23291.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 04 May 2009, David Rientjes wrote: > On Mon, 4 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 > > @@ -1620,7 +1620,8 @@ nofail_alloc: > > } > > > > /* The OOM killer will not help higher order allocs so fail */ > > - if (order > PAGE_ALLOC_COSTLY_ORDER) { > > + if (order > PAGE_ALLOC_COSTLY_ORDER || > > + (gfp_mask & __GFP_NO_OOM_KILL)) { > > clear_zonelist_oom(zonelist, gfp_mask); > > goto nopage; > > } > > This is inconsistent because __GFP_NO_OOM_KILL now implies __GFP_NORETRY > (the "goto nopage" above), but only for allocations with __GFP_FS set and > __GFP_NORETRY clear. Well, what would you suggest? Rafael From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH 1/5] mm: Add __GFP_NO_OOM_KILL flag Date: Mon, 4 May 2009 17:02:22 +0200 Message-ID: <200905041702.23291.rjw@sisk.pl> References: <200905040210.10153.rjw@sisk.pl> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Content-Disposition: inline Sender: kernel-testers-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: Text/Plain; charset="us-ascii" To: David Rientjes Cc: Wu Fengguang , linux-pm-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Andrew Morton , pavel-+ZI9xUNit7I@public.gmane.org, torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, jens.axboe-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org, alan-jenkins-cCz0Lq7MMjm9FHfhHBbuYA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-testers-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Monday 04 May 2009, David Rientjes wrote: > On Mon, 4 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 > > @@ -1620,7 +1620,8 @@ nofail_alloc: > > } > > > > /* The OOM killer will not help higher order allocs so fail */ > > - if (order > PAGE_ALLOC_COSTLY_ORDER) { > > + if (order > PAGE_ALLOC_COSTLY_ORDER || > > + (gfp_mask & __GFP_NO_OOM_KILL)) { > > clear_zonelist_oom(zonelist, gfp_mask); > > goto nopage; > > } > > This is inconsistent because __GFP_NO_OOM_KILL now implies __GFP_NORETRY > (the "goto nopage" above), but only for allocations with __GFP_FS set and > __GFP_NORETRY clear. Well, what would you suggest? Rafael