lkml.org 
[lkml]   [2010]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: linux-next: Tree for August 25 (mm/slub)
    On Wed, 25 Aug 2010, Christoph Lameter wrote:

    > > Certainly. config file is attached.
    >
    > Ah. Memory hotplug....
    >
    >
    >
    > Subject: Slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
    >
    > Memory hotplug allocates and frees per node structures. Use the correct name.
    >
    > Signed-off-by: Christoph Lameter <cl@linux.com>

    Acked-by: David Rientjes <rientjes@google.com>

    But we also need to fixup SLUB_RESILIENCY_TEST.


    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.

    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    mm/slub.c | 14 ++++++++------
    1 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/mm/slub.c b/mm/slub.c
    --- a/mm/slub.c
    +++ b/mm/slub.c
    @@ -3486,6 +3486,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");
    @@ -3495,7 +3497,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);
    @@ -3505,7 +3507,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;
    @@ -3513,27 +3515,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) {};

    \
     
     \ /
      Last update: 2010-08-26 01:35    [W:0.034 / U:31.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site