lkml.org 
[lkml]   [2011]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[slubllv4 08/16] slub: Pass kmem_cache struct to lock and freeze slab
    We need more information about the slab for the cmpxchg implementation.

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

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

    Index: linux-2.6/mm/slub.c
    ===================================================================
    --- linux-2.6.orig/mm/slub.c 2011-04-28 15:53:45.000000000 -0500
    +++ linux-2.6/mm/slub.c 2011-04-28 15:53:50.000000000 -0500
    @@ -1424,8 +1424,8 @@ static inline void remove_partial(struct
    *
    * Must hold list_lock.
    */
    -static inline int lock_and_freeze_slab(struct kmem_cache_node *n,
    - struct page *page)
    +static inline int lock_and_freeze_slab(struct kmem_cache *s,
    + struct kmem_cache_node *n, struct page *page)
    {
    if (slab_trylock(page)) {
    remove_partial(n, page);
    @@ -1437,7 +1437,8 @@ static inline int lock_and_freeze_slab(s
    /*
    * Try to allocate a partial slab from a specific node.
    */
    -static struct page *get_partial_node(struct kmem_cache_node *n)
    +static struct page *get_partial_node(struct kmem_cache *s,
    + struct kmem_cache_node *n)
    {
    struct page *page;

    @@ -1452,7 +1453,7 @@ static struct page *get_partial_node(str

    spin_lock(&n->list_lock);
    list_for_each_entry(page, &n->partial, lru)
    - if (lock_and_freeze_slab(n, page))
    + if (lock_and_freeze_slab(s, n, page))
    goto out;
    page = NULL;
    out:
    @@ -1503,7 +1504,7 @@ static struct page *get_any_partial(stru

    if (n && cpuset_zone_allowed_hardwall(zone, flags) &&
    n->nr_partial > s->min_partial) {
    - page = get_partial_node(n);
    + page = get_partial_node(s, n);
    if (page) {
    put_mems_allowed();
    return page;
    @@ -1523,7 +1524,7 @@ static struct page *get_partial(struct k
    struct page *page;
    int searchnode = (node == NUMA_NO_NODE) ? numa_node_id() : node;

    - page = get_partial_node(get_node(s, searchnode));
    + page = get_partial_node(s, get_node(s, searchnode));
    if (page || node != NUMA_NO_NODE)
    return page;



    \
     
     \ /
      Last update: 2011-05-06 20:11    [W:3.710 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site