From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754864Ab1A1ICT (ORCPT ); Fri, 28 Jan 2011 03:02:19 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:53199 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754386Ab1A1ICR (ORCPT ); Fri, 28 Jan 2011 03:02:17 -0500 Date: Fri, 28 Jan 2011 09:02:13 +0100 From: Johannes Weiner To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "nishimura@mxp.nes.nec.co.jp" , "balbir@linux.vnet.ibm.com" Subject: Re: [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge Message-ID: <20110128080213.GC2213@cmpxchg.org> References: <20110128122229.6a4c74a2.kamezawa.hiroyu@jp.fujitsu.com> <20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 28, 2011 at 12:27:29PM +0900, KAMEZAWA Hiroyuki wrote: > > Thanks to Johanns and Daisuke for suggestion. > = > Hugepage allocation shouldn't trigger oom. > Allocation failure is not fatal. > > Orignal-patch-by: Johannes Weiner > Signed-off-by: KAMEZAWA Hiroyuki > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > Index: mmotm-0125/mm/memcontrol.c > =================================================================== > --- mmotm-0125.orig/mm/memcontrol.c > +++ mmotm-0125/mm/memcontrol.c > @@ -2369,11 +2369,14 @@ static int mem_cgroup_charge_common(stru > struct page_cgroup *pc; > int ret; > int page_size = PAGE_SIZE; > + bool oom; > > if (PageTransHuge(page)) { > page_size <<= compound_order(page); > VM_BUG_ON(!PageTransHuge(page)); > - } > + oom = false; > + } else > + oom = true; That needs a comment. You can take the one from my patch if you like. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail143.messagelabs.com (mail143.messagelabs.com [216.82.254.35]) by kanga.kvack.org (Postfix) with ESMTP id C51E38D0039 for ; Fri, 28 Jan 2011 03:02:17 -0500 (EST) Date: Fri, 28 Jan 2011 09:02:13 +0100 From: Johannes Weiner Subject: Re: [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge Message-ID: <20110128080213.GC2213@cmpxchg.org> References: <20110128122229.6a4c74a2.kamezawa.hiroyu@jp.fujitsu.com> <20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com> Sender: owner-linux-mm@kvack.org To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "nishimura@mxp.nes.nec.co.jp" , "balbir@linux.vnet.ibm.com" List-ID: On Fri, Jan 28, 2011 at 12:27:29PM +0900, KAMEZAWA Hiroyuki wrote: > > Thanks to Johanns and Daisuke for suggestion. > = > Hugepage allocation shouldn't trigger oom. > Allocation failure is not fatal. > > Orignal-patch-by: Johannes Weiner > Signed-off-by: KAMEZAWA Hiroyuki > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > Index: mmotm-0125/mm/memcontrol.c > =================================================================== > --- mmotm-0125.orig/mm/memcontrol.c > +++ mmotm-0125/mm/memcontrol.c > @@ -2369,11 +2369,14 @@ static int mem_cgroup_charge_common(stru > struct page_cgroup *pc; > int ret; > int page_size = PAGE_SIZE; > + bool oom; > > if (PageTransHuge(page)) { > page_size <<= compound_order(page); > VM_BUG_ON(!PageTransHuge(page)); > - } > + oom = false; > + } else > + oom = true; That needs a comment. You can take the one from my patch if you like. -- 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/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org