lkml.org 
[lkml]   [2012]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] mm, bootmem: panic in bootmem alloc functions even if slab is available
Date
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 <sasha.levin@oracle.com>
---
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


\
 
 \ /
  Last update: 2012-12-23 21:41    [W:0.086 / U:1.800 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site