diff options
| author | David Rientjes <rientjes@google.com> | 2010-08-25 16:32:27 -0700 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-02 10:24:29 +0300 |
| commit | a016471a16b5c4d4ec8f5221575e603a3d11e5e9 (patch) | |
| tree | ffc9e385f0db13aa5dad34a461fac38a0638474e /mm | |
| parent | 8de66a0c022c7c575c7481224803292cdabed4c4 (diff) | |
| download | linux-a016471a16b5c4d4ec8f5221575e603a3d11e5e9.tar.gz | |
slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches
Now that the kmalloc_caches array is dynamically allocated at boot,
SLUB_RESILIENCY_TEST needs to be fixed to pass the correct type.
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mm/slub.c b/mm/slub.c index b244a5a11a98..4c5a76f505ea 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3498,6 +3498,8 @@ static void resiliency_test(void) { u8 *p; + BUILD_BUG_ON(KMALLOC_MIN_SIZE > 16 || SLUB_PAGE_SHIFT < 10); + printk(KERN_ERR "SLUB resiliency testing\n"); printk(KERN_ERR "-----------------------\n"); printk(KERN_ERR "A. Corruption after allocation\n"); @@ -3507,7 +3509,7 @@ static void resiliency_test(void) printk(KERN_ERR "\n1. kmalloc-16: Clobber Redzone/next pointer" " 0x12->0x%p\n\n", p + 16); - validate_slab_cache(kmalloc_caches + 4); + validate_slab_cache(kmalloc_caches[4]); /* Hmmm... The next two are dangerous */ p = kzalloc(32, GFP_KERNEL); @@ -3517,7 +3519,7 @@ static void resiliency_test(void) printk(KERN_ERR "If allocated object is overwritten then not detectable\n\n"); - validate_slab_cache(kmalloc_caches + 5); + validate_slab_cache(kmalloc_caches[5]); p = kzalloc(64, GFP_KERNEL); p += 64 + (get_cycles() & 0xff) * sizeof(void *); *p = 0x56; @@ -3525,27 +3527,27 @@ static void resiliency_test(void) p); printk(KERN_ERR "If allocated object is overwritten then not detectable\n\n"); - validate_slab_cache(kmalloc_caches + 6); + validate_slab_cache(kmalloc_caches[6]); printk(KERN_ERR "\nB. Corruption after free\n"); p = kzalloc(128, GFP_KERNEL); kfree(p); *p = 0x78; printk(KERN_ERR "1. kmalloc-128: Clobber first word 0x78->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches + 7); + validate_slab_cache(kmalloc_caches[7]); p = kzalloc(256, GFP_KERNEL); kfree(p); p[50] = 0x9a; printk(KERN_ERR "\n2. kmalloc-256: Clobber 50th byte 0x9a->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches + 8); + validate_slab_cache(kmalloc_caches[8]); p = kzalloc(512, GFP_KERNEL); kfree(p); p[512] = 0xab; printk(KERN_ERR "\n3. kmalloc-512: Clobber redzone 0xab->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches + 9); + validate_slab_cache(kmalloc_caches[9]); } #else static void resiliency_test(void) {}; |