Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SLUB: CONFIG_LARGE_ALLOCS must consider MAX_ORDER limit

Browse source 
Take MAX_ORDER into consideration when determining KMALLOC_SHIFT_HIGH.
Otherwise we may run into a situation where we attempt to create general
slabs larger than MAX_ORDER.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-05-15 01:42:06 -07:00 committed by Linus Torvalds
parent 6a3ee3d552
commit cfbf07f2a8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/slub_def.h
View file

@ -60,7 +60,8 @@ struct kmem_cache {
#define KMALLOC_SHIFT_LOW 3 #define KMALLOC_SHIFT_LOW 3
#ifdef CONFIG_LARGE_ALLOCS #ifdef CONFIG_LARGE_ALLOCS
#define KMALLOC_SHIFT_HIGH 25 #define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT) =< 25 ? \
(MAX_ORDER + PAGE_SHIFT - 1) : 25)
#else #else
#if !defined(CONFIG_MMU) || NR_CPUS > 512 || MAX_NUMNODES > 256 #if !defined(CONFIG_MMU) || NR_CPUS > 512 || MAX_NUMNODES > 256
#define KMALLOC_SHIFT_HIGH 20 #define KMALLOC_SHIFT_HIGH 20
@ -87,6 +88,9 @@ static inline int kmalloc_index(int size)
*/ */
WARN_ON_ONCE(size == 0); WARN_ON_ONCE(size == 0);
if (size >= (1 << KMALLOC_SHIFT_HIGH))
return -1;
if (size > 64 && size <= 96) if (size > 64 && size <= 96)
return 1; return 1;
if (size > 128 && size <= 192) if (size > 128 && size <= 192)