From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx149.postini.com [74.125.245.149]) by kanga.kvack.org (Postfix) with SMTP id 17DF98D0003 for ; Sun, 23 Dec 2012 15:16:02 -0500 (EST) From: Sasha Levin Subject: [PATCH 2/3] mm, bootmem: panic in bootmem alloc functions even if slab is available Date: Sun, 23 Dec 2012 15:15:07 -0500 Message-Id: <1356293711-23864-2-git-send-email-sasha.levin@oracle.com> In-Reply-To: <1356293711-23864-1-git-send-email-sasha.levin@oracle.com> References: <1356293711-23864-1-git-send-email-sasha.levin@oracle.com> Sender: owner-linux-mm@kvack.org List-ID: To: rientjes@google.com, Andrew Morton , Johannes Weiner , "David S. Miller" , Tejun Heo , Joonsoo Kim , Yinghai Lu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Sasha Levin Bootmem alloc functions are supposed to panic if allocation fails unless a *_nopanic() function is used. However, if slab is available this is not the case currently, and the function might return a NULL. Currect it to panic on failed allocations even if slab is available. Signed-off-by: Sasha Levin --- mm/bootmem.c | 9 --------- mm/nobootmem.c | 6 ------ 2 files changed, 15 deletions(-) diff --git a/mm/bootmem.c b/mm/bootmem.c index 1324cd7..198a92f 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -763,9 +763,6 @@ void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat, size, align, goal, 0); } @@ -775,9 +772,6 @@ void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size, #ifdef MAX_DMA32_PFN unsigned long end_pfn; - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - /* update goal according ...MAX_DMA32_PFN */ end_pfn = pgdat->node_start_pfn + pgdat->node_spanned_pages; @@ -839,9 +833,6 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat, size, align, goal, ARCH_LOW_ADDRESS_LIMIT); } diff --git a/mm/nobootmem.c b/mm/nobootmem.c index b8294fc..7c4c608 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -371,9 +371,6 @@ void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat, size, align, goal, 0); } @@ -424,9 +421,6 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal) { - if (WARN_ON_ONCE(slab_is_available())) - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat, size, align, goal, ARCH_LOW_ADDRESS_LIMIT); } -- 1.8.0 -- 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