lkml.org 
[lkml]   [2014]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC 1/4] slub: Remove __slab_alloc code duplication
    Somehow the two branches in __slab_alloc do the same.
    Unify them.

    Signed-off-by: Christoph Lameter <cl@linux.com>

    Index: linux/mm/slub.c
    ===================================================================
    --- linux.orig/mm/slub.c
    +++ linux/mm/slub.c
    @@ -2280,12 +2280,8 @@ redo:
    if (node != NUMA_NO_NODE && !node_present_pages(node))
    searchnode = node_to_mem_node(node);

    - if (unlikely(!node_match(page, searchnode))) {
    - stat(s, ALLOC_NODE_MISMATCH);
    - deactivate_slab(s, page, c->freelist);
    - c->page = NULL;
    - c->freelist = NULL;
    - goto new_slab;
    + if (unlikely(!node_match(page, searchnode)))
    + goto deactivate;
    }
    }

    @@ -2294,12 +2290,8 @@ redo:
    * PFMEMALLOC but right now, we are losing the pfmemalloc
    * information when the page leaves the per-cpu allocator
    */
    - if (unlikely(!pfmemalloc_match(page, gfpflags))) {
    - deactivate_slab(s, page, c->freelist);
    - c->page = NULL;
    - c->freelist = NULL;
    - goto new_slab;
    - }
    + if (unlikely(!pfmemalloc_match(page, gfpflags)))
    + goto deactivate;

    /* must check again c->freelist in case of cpu migration or IRQ */
    freelist = c->freelist;
    @@ -2328,6 +2320,11 @@ load_freelist:
    local_irq_restore(flags);
    return freelist;

    +deactivate:
    + deactivate_slab(s, page, c->freelist);
    + c->page = NULL;
    + c->freelist = NULL;
    +
    new_slab:

    if (c->partial) {


    \
     
     \ /
      Last update: 2014-10-22 18:21    [W:2.447 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site