lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: Do not use 192 byte sized cache if minimum alignment is 128 byte
This commit is contained in:
Linus Torvalds
2008-07-04 09:48:21 -07:00
parent 852bb9f594 41d54d3bf8
commit 3ea9eed493
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/slub_def.h
View File

@@ -137,10 +137,12 @@ static __always_inline int kmalloc_index(size_t size)
if (size <= KMALLOC_MIN_SIZE) if (size <= KMALLOC_MIN_SIZE)
return KMALLOC_SHIFT_LOW; return KMALLOC_SHIFT_LOW;
#if KMALLOC_MIN_SIZE <= 64
if (size > 64 && size <= 96) if (size > 64 && size <= 96)
return 1; return 1;
if (size > 128 && size <= 192) if (size > 128 && size <= 192)
return 2; return 2;
#endif
if (size <= 8) return 3; if (size <= 8) return 3;
if (size <= 16) return 4; if (size <= 16) return 4;
if (size <= 32) return 5; if (size <= 32) return 5;

12
mm/slub.c
View File

@@ -2995,8 +2995,6 @@ void __init kmem_cache_init(void)
create_kmalloc_cache(&kmalloc_caches[1], create_kmalloc_cache(&kmalloc_caches[1],
"kmalloc-96", 96, GFP_KERNEL); "kmalloc-96", 96, GFP_KERNEL);
caches++; caches++;
}
if (KMALLOC_MIN_SIZE <= 128) {
create_kmalloc_cache(&kmalloc_caches[2], create_kmalloc_cache(&kmalloc_caches[2],
"kmalloc-192", 192, GFP_KERNEL); "kmalloc-192", 192, GFP_KERNEL);
caches++; caches++;
@@ -3026,6 +3024,16 @@ void __init kmem_cache_init(void)
for (i = 8; i < KMALLOC_MIN_SIZE; i += 8) for (i = 8; i < KMALLOC_MIN_SIZE; i += 8)
size_index[(i - 1) / 8] = KMALLOC_SHIFT_LOW; size_index[(i - 1) / 8] = KMALLOC_SHIFT_LOW;
if (KMALLOC_MIN_SIZE == 128) {
/*
* The 192 byte sized cache is not used if the alignment
* is 128 byte. Redirect kmalloc to use the 256 byte cache
* instead.
*/
for (i = 128 + 8; i <= 192; i += 8)
size_index[(i - 1) / 8] = 8;
}
slab_state = UP; slab_state = UP;
/* Provide the correct kmalloc names now that the caches are up */ /* Provide the correct kmalloc names now that the caches are up */