Commit 1cf3eb2ff6b0844c678f2f48d0053b9d12b7da67

Authored by Jeff Mahoney
Committed by Pekka Enberg
1 parent a6525042bf

kmalloc: return NULL instead of link failure

The SLAB kmalloc with a constant value isn't consistent with the other
implementations because it bails out with __you_cannot_kmalloc_that_much
rather than returning NULL and properly allowing the caller to fall back
to vmalloc or take other action.  This doesn't happen with a non-constant
value or with SLOB or SLUB.

Starting with 2.6.28, I've been seeing build failures on s390x.  This is
due to init_section_page_cgroup trying to allocate 2.5MB when the max size
for a kmalloc on s390x is 2MB.

It's failing because the value is constant.  The workarounds at the call
size are ugly and the caller shouldn't have to change behavior depending
on what the backend of the API is.

So, this patch eliminates the link failure and returns NULL like the other
implementations.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: <stable@kernel.org>		[2.6.28.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

Showing 1 changed file with 2 additions and 8 deletions Side-by-side Diff

include/linux/slab_def.h
... ... @@ -43,10 +43,7 @@
43 43 i++;
44 44 #include <linux/kmalloc_sizes.h>
45 45 #undef CACHE
46   - {
47   - extern void __you_cannot_kmalloc_that_much(void);
48   - __you_cannot_kmalloc_that_much();
49   - }
  46 + return NULL;
50 47 found:
51 48 #ifdef CONFIG_ZONE_DMA
52 49 if (flags & GFP_DMA)
... ... @@ -77,10 +74,7 @@
77 74 i++;
78 75 #include <linux/kmalloc_sizes.h>
79 76 #undef CACHE
80   - {
81   - extern void __you_cannot_kmalloc_that_much(void);
82   - __you_cannot_kmalloc_that_much();
83   - }
  77 + return NULL;
84 78 found:
85 79 #ifdef CONFIG_ZONE_DMA
86 80 if (flags & GFP_DMA)