From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx140.postini.com [74.125.245.140]) by kanga.kvack.org (Postfix) with SMTP id 038336B005D for ; Thu, 12 Jul 2012 01:54:46 -0400 (EDT) From: Yinghai Lu Subject: [PATCH] bootmem: Make ___alloc_bootmem_node_nopanic() to be real nopanic Date: Wed, 11 Jul 2012 22:54:09 -0700 Message-Id: <1342072449-13263-1-git-send-email-yinghai@kernel.org> In-Reply-To: <20120711210254.AFF6D20004E@hpza10.eem.corp.google.com> References: <20120711210254.AFF6D20004E@hpza10.eem.corp.google.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Johannes Weiner , Tejun Heo , Gavin Shan Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yinghai Lu , stable@vger.kernel.org, "[3.3.x, 3.4.x]"@acsmt357.oracle.com after | From 99ab7b19440a72ebdf225f99b20f8ef40decee86 Mon Sep 17 00:00:00 2001 | Date: Wed, 11 Jul 2012 14:02:53 -0700 | Subject: [PATCH] mm: sparse: fix usemap allocation above node descriptor section Johannes said: | while backporting the below patch, I realised that your fix busted | f5bf18fa22f8 again. The problem was not a panicking version on | allocation failure but when the usemap size was too large such that | goal + size > limit triggers the BUG_ON in the bootmem allocator. So | we need a version that passes limit ONLY if the usemap is smaller than | the section. after checking the code, the name of ___alloc_bootmem_node_nopanic() does not reflect the fact. Make bootmem really not panic. Hope will kill bootmem sooner. Signed-off-by: Yinghai Lu Cc: Andrew Morton Cc: Johannes Weiner Cc: [3.3.x, 3.4.x] --- mm/bootmem.c | 4 ++++ 1 file changed, 4 insertions(+) Index: linux-2.6/mm/bootmem.c =================================================================== --- linux-2.6.orig/mm/bootmem.c +++ linux-2.6/mm/bootmem.c @@ -710,6 +710,10 @@ again: if (ptr) return ptr; + /* do not panic in alloc_bootmem_bdata() */ + if (limit && goal + size > limit) + limit = 0; + ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, limit); if (ptr) return ptr; -- 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