lkml.org 
[lkml]   [2011]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[slubllv3 08/21] slub: Move page->frozen handling near where the page->freelist handling occurs
    This is necessary because the frozen bit has to be handled in the same cmpxchg_double
    with the freelist and the counters.

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

    ---
    mm/slub.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    Index: linux-2.6/mm/slub.c
    ===================================================================
    --- linux-2.6.orig/mm/slub.c 2011-04-15 13:14:36.000000000 -0500
    +++ linux-2.6/mm/slub.c 2011-04-15 13:14:40.000000000 -0500
    @@ -1264,6 +1264,7 @@ static struct page *new_slab(struct kmem

    page->freelist = start;
    page->inuse = 0;
    + page->frozen = 1;
    out:
    return page;
    }
    @@ -1402,7 +1403,6 @@ static inline int lock_and_freeze_slab(s
    {
    if (slab_trylock(page)) {
    __remove_partial(n, page);
    - page->frozen = 1;
    return 1;
    }
    return 0;
    @@ -1516,7 +1516,6 @@ static void unfreeze_slab(struct kmem_ca
    {
    struct kmem_cache_node *n = get_node(s, page_to_nid(page));

    - page->frozen = 0;
    if (page->inuse) {

    if (page->freelist) {
    @@ -1657,6 +1656,7 @@ static void deactivate_slab(struct kmem_
    #ifdef CONFIG_CMPXCHG_LOCAL
    c->tid = next_tid(c->tid);
    #endif
    + page->frozen = 0;
    unfreeze_slab(s, page, tail);
    }

    @@ -1819,6 +1819,8 @@ static void *__slab_alloc(struct kmem_ca
    stat(s, ALLOC_REFILL);

    load_freelist:
    + VM_BUG_ON(!page->frozen);
    +
    object = page->freelist;
    if (unlikely(!object))
    goto another_slab;
    @@ -1845,6 +1847,7 @@ new_slab:
    page = get_partial(s, gfpflags, node);
    if (page) {
    stat(s, ALLOC_FROM_PARTIAL);
    + page->frozen = 1;
    load_from_page:
    c->node = page_to_nid(page);
    c->page = page;
    @@ -1867,7 +1870,6 @@ load_from_page:
    flush_slab(s, c);

    slab_lock(page);
    - page->frozen = 1;

    goto load_from_page;
    }
    @@ -2430,6 +2432,7 @@ static void early_kmem_cache_node_alloc(
    BUG_ON(!n);
    page->freelist = get_freepointer(kmem_cache_node, n);
    page->inuse++;
    + page->frozen = 0;
    kmem_cache_node->node[node] = n;
    #ifdef CONFIG_SLUB_DEBUG
    init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);


    \
     
     \ /
      Last update: 2011-04-15 22:53    [W:0.024 / U:0.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site