Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: Allow removal of slab caches during boot
  Revert "slub: Allow removal of slab caches during boot"
  slub numa: Fix rare allocation from unexpected node
  slab: use deferable timers for its periodic housekeeping
  slub: Use kmem_cache flags to detect if slab is in debugging mode.
  slub: Allow removal of slab caches during boot
  slub: Check kasprintf results in kmem_cache_init()
  SLUB: Constants need UL
  slub: Use a constant for a unspecified node.
  SLOB: Free objects to their own list
  slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING

diff --combined mm/slab.c
index 47360c3e5abde0bd27e0ce418bc7a8d1c3ab5b57,29aad44a55c2d7fb40e2a0c888cea61de130c944..736e497733d60c99ed376ae2bc1b378aea34a0f7
--- 1/mm/slab.c
--- 2/mm/slab.c
+++ b/mm/slab.c
@@@ -102,6 -102,7 +102,6 @@@
  #include      <linux/cpu.h>
  #include      <linux/sysctl.h>
  #include      <linux/module.h>
 -#include      <linux/kmemtrace.h>
  #include      <linux/rcupdate.h>
  #include      <linux/string.h>
  #include      <linux/uaccess.h>
@@@ -860,7 -861,7 +860,7 @@@ static void __cpuinit start_cpu_timer(i
         */
        if (keventd_up() && reap_work->work.func == NULL) {
                init_reap_node(cpu);
-               INIT_DELAYED_WORK(reap_work, cache_reap);
+               INIT_DELAYED_WORK_DEFERRABLE(reap_work, cache_reap);
                schedule_delayed_work_on(cpu, reap_work,
                                        __round_jiffies_relative(HZ, cpu));
        }

diff --combined mm/slob.c
index 3f19a347dabf1f9373f3f16b99351ef8f6151612,6a208f81888a3c09b0161e1fc23bf41fb7367dfd..d582171c81014c027227ddbb7b3916661ecb1ef8
--- 1/mm/slob.c
--- 2/mm/slob.c
+++ b/mm/slob.c
@@@ -66,10 -66,8 +66,10 @@@
  #include <linux/module.h>
  #include <linux/rcupdate.h>
  #include <linux/list.h>
 -#include <linux/kmemtrace.h>
  #include <linux/kmemleak.h>
 +
 +#include <trace/events/kmem.h>
 +
  #include <asm/atomic.h>
  
  /*
@@@ -396,6 -394,7 +396,7 @@@ static void slob_free(void *block, int 
        slob_t *prev, *next, *b = (slob_t *)block;
        slobidx_t units;
        unsigned long flags;
+       struct list_head *slob_list;
  
        if (unlikely(ZERO_OR_NULL_PTR(block)))
                return;
@@@ -424,7 -423,13 +425,13 @@@
                set_slob(b, units,
                        (void *)((unsigned long)(b +
                                        SLOB_UNITS(PAGE_SIZE)) & PAGE_MASK));
-               set_slob_page_free(sp, &free_slob_small);
+               if (size < SLOB_BREAK1)
+                       slob_list = &free_slob_small;
+               else if (size < SLOB_BREAK2)
+                       slob_list = &free_slob_medium;
+               else
+                       slob_list = &free_slob_large;
+               set_slob_page_free(sp, slob_list);
                goto out;
        }
  
@@@ -641,6 -646,7 +648,6 @@@ void kmem_cache_free(struct kmem_cache 
        if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
                struct slob_rcu *slob_rcu;
                slob_rcu = b + (c->size - sizeof(struct slob_rcu));
 -              INIT_RCU_HEAD(&slob_rcu->head);
                slob_rcu->size = c->size;
                call_rcu(&slob_rcu->head, kmem_rcu_free);
        } else {

diff --combined mm/slub.c
index 7bb7940f4eeea2a686937d69795c3acb95077297,fba51d6d4cc44ee659e634eb65fb2e764063c8ac..13fffe1f0f3dc5992471ffd590326b9517b0cc3a
--- 1/mm/slub.c
--- 2/mm/slub.c
+++ b/mm/slub.c
@@@ -17,6 -17,7 +17,6 @@@
  #include <linux/slab.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
 -#include <linux/kmemtrace.h>
  #include <linux/kmemcheck.h>
  #include <linux/cpu.h>
  #include <linux/cpuset.h>
@@@ -106,11 -107,17 +106,17 @@@
   *                    the fast path and disables lockless freelists.
   */
  
+ #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \
+               SLAB_TRACE | SLAB_DEBUG_FREE)
+ 
+ static inline int kmem_cache_debug(struct kmem_cache *s)
+ {
  #ifdef CONFIG_SLUB_DEBUG
- #define SLABDEBUG 1
+       return unlikely(s->flags & SLAB_DEBUG_FLAGS);
  #else
- #define SLABDEBUG 0
+       return 0;
  #endif
+ }
  
  /*
   * Issues still to be resolved:
@@@ -161,8 -168,8 +167,8 @@@
  #define MAX_OBJS_PER_PAGE     65535 /* since page.objects is u16 */
  
  /* Internal SLUB flags */
- #define __OBJECT_POISON               0x80000000 /* Poison object */
- #define __SYSFS_ADD_DEFERRED  0x40000000 /* Not yet visible via sysfs */
+ #define __OBJECT_POISON               0x80000000UL /* Poison object */
+ #define __SYSFS_ADD_DEFERRED  0x40000000UL /* Not yet visible via sysfs */
  
  static int kmem_size = sizeof(struct kmem_cache);
  
@@@ -1072,7 -1079,7 +1078,7 @@@ static inline struct page *alloc_slab_p
  
        flags |= __GFP_NOTRACK;
  
-       if (node == -1)
+       if (node == NUMA_NO_NODE)
                return alloc_pages(flags, order);
        else
                return alloc_pages_exact_node(node, flags, order);
@@@ -1156,9 -1163,6 +1162,6 @@@ static struct page *new_slab(struct kme
        inc_slabs_node(s, page_to_nid(page), page->objects);
        page->slab = s;
        page->flags |= 1 << PG_slab;
-       if (s->flags & (SLAB_DEBUG_FREE | SLAB_RED_ZONE | SLAB_POISON |
-                       SLAB_STORE_USER | SLAB_TRACE))
-               __SetPageSlubDebug(page);
  
        start = page_address(page);
  
@@@ -1185,14 -1189,13 +1188,13 @@@ static void __free_slab(struct kmem_cac
        int order = compound_order(page);
        int pages = 1 << order;
  
-       if (unlikely(SLABDEBUG && PageSlubDebug(page))) {
+       if (kmem_cache_debug(s)) {
                void *p;
  
                slab_pad_check(s, page);
                for_each_object(p, s, page_address(page),
                                                page->objects)
                        check_object(s, page, p, 0);
-               __ClearPageSlubDebug(page);
        }
  
        kmemcheck_free_shadow(page, compound_order(page));
@@@ -1386,10 -1389,10 +1388,10 @@@ static struct page *get_any_partial(str
  static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int node)
  {
        struct page *page;
-       int searchnode = (node == -1) ? numa_node_id() : node;
+       int searchnode = (node == NUMA_NO_NODE) ? numa_node_id() : node;
  
        page = get_partial_node(get_node(s, searchnode));
-       if (page || (flags & __GFP_THISNODE))
+       if (page || node != -1)
                return page;
  
        return get_any_partial(s, flags);
@@@ -1414,8 -1417,7 +1416,7 @@@ static void unfreeze_slab(struct kmem_c
                        stat(s, tail ? DEACTIVATE_TO_TAIL : DEACTIVATE_TO_HEAD);
                } else {
                        stat(s, DEACTIVATE_FULL);
-                       if (SLABDEBUG && PageSlubDebug(page) &&
-                                               (s->flags & SLAB_STORE_USER))
+                       if (kmem_cache_debug(s) && (s->flags & SLAB_STORE_USER))
                                add_full(n, page);
                }
                slab_unlock(page);
@@@ -1514,7 -1516,7 +1515,7 @@@ static void flush_all(struct kmem_cach
  static inline int node_match(struct kmem_cache_cpu *c, int node)
  {
  #ifdef CONFIG_NUMA
-       if (node != -1 && c->node != node)
+       if (node != NUMA_NO_NODE && c->node != node)
                return 0;
  #endif
        return 1;
@@@ -1623,7 -1625,7 +1624,7 @@@ load_freelist
        object = c->page->freelist;
        if (unlikely(!object))
                goto another_slab;
-       if (unlikely(SLABDEBUG && PageSlubDebug(c->page)))
+       if (kmem_cache_debug(s))
                goto debug;
  
        c->freelist = get_freepointer(s, object);
@@@ -1726,7 -1728,7 +1727,7 @@@ static __always_inline void *slab_alloc
  
  void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags)
  {
-       void *ret = slab_alloc(s, gfpflags, -1, _RET_IP_);
+       void *ret = slab_alloc(s, gfpflags, NUMA_NO_NODE, _RET_IP_);
  
        trace_kmem_cache_alloc(_RET_IP_, ret, s->objsize, s->size, gfpflags);
  
@@@ -1737,7 -1739,7 +1738,7 @@@ EXPORT_SYMBOL(kmem_cache_alloc)
  #ifdef CONFIG_TRACING
  void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags)
  {
-       return slab_alloc(s, gfpflags, -1, _RET_IP_);
+       return slab_alloc(s, gfpflags, NUMA_NO_NODE, _RET_IP_);
  }
  EXPORT_SYMBOL(kmem_cache_alloc_notrace);
  #endif
@@@ -1782,7 -1784,7 +1783,7 @@@ static void __slab_free(struct kmem_cac
        stat(s, FREE_SLOWPATH);
        slab_lock(page);
  
-       if (unlikely(SLABDEBUG && PageSlubDebug(page)))
+       if (kmem_cache_debug(s))
                goto debug;
  
  checks_ok:
@@@ -2489,7 -2491,6 +2490,6 @@@ void kmem_cache_destroy(struct kmem_cac
        s->refcount--;
        if (!s->refcount) {
                list_del(&s->list);
-               up_write(&slub_lock);
                if (kmem_cache_close(s)) {
                        printk(KERN_ERR "SLUB %s: %s called for cache that "
                                "still has objects.\n", s->name, __func__);
@@@ -2498,8 -2499,8 +2498,8 @@@
                if (s->flags & SLAB_DESTROY_BY_RCU)
                        rcu_barrier();
                sysfs_slab_remove(s);
-       } else
-               up_write(&slub_lock);
+       }
+       up_write(&slub_lock);
  }
  EXPORT_SYMBOL(kmem_cache_destroy);
  
@@@ -2727,7 -2728,7 +2727,7 @@@ void *__kmalloc(size_t size, gfp_t flag
        if (unlikely(ZERO_OR_NULL_PTR(s)))
                return s;
  
-       ret = slab_alloc(s, flags, -1, _RET_IP_);
+       ret = slab_alloc(s, flags, NUMA_NO_NODE, _RET_IP_);
  
        trace_kmalloc(_RET_IP_, ret, size, s->size, flags);
  
@@@ -3117,9 -3118,12 +3117,12 @@@ void __init kmem_cache_init(void
        slab_state = UP;
  
        /* Provide the correct kmalloc names now that the caches are up */
-       for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++)
-               kmalloc_caches[i]. name =
-                       kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i);
+       for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
+               char *s = kasprintf(GFP_NOWAIT, "kmalloc-%d", 1 << i);
+ 
+               BUG_ON(!s);
+               kmalloc_caches[i].name = s;
+       }
  
  #ifdef CONFIG_SMP
        register_cpu_notifier(&slab_notifier);
@@@ -3222,14 -3226,12 +3225,12 @@@ struct kmem_cache *kmem_cache_create(co
                 */
                s->objsize = max(s->objsize, (int)size);
                s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
-               up_write(&slub_lock);
  
                if (sysfs_slab_alias(s, name)) {
-                       down_write(&slub_lock);
                        s->refcount--;
-                       up_write(&slub_lock);
                        goto err;
                }
+               up_write(&slub_lock);
                return s;
        }
  
@@@ -3238,14 -3240,12 +3239,12 @@@
                if (kmem_cache_open(s, GFP_KERNEL, name,
                                size, align, flags, ctor)) {
                        list_add(&s->list, &slab_caches);
-                       up_write(&slub_lock);
                        if (sysfs_slab_add(s)) {
-                               down_write(&slub_lock);
                                list_del(&s->list);
-                               up_write(&slub_lock);
                                kfree(s);
                                goto err;
                        }
+                       up_write(&slub_lock);
                        return s;
                }
                kfree(s);
@@@ -3311,7 -3311,7 +3310,7 @@@ void *__kmalloc_track_caller(size_t siz
        if (unlikely(ZERO_OR_NULL_PTR(s)))
                return s;
  
-       ret = slab_alloc(s, gfpflags, -1, caller);
+       ret = slab_alloc(s, gfpflags, NUMA_NO_NODE, caller);
  
        /* Honor the call site pointer we recieved. */
        trace_kmalloc(caller, ret, size, s->size, gfpflags);
@@@ -3394,16 -3394,6 +3393,6 @@@ static void validate_slab_slab(struct k
        } else
                printk(KERN_INFO "SLUB %s: Skipped busy slab 0x%p\n",
                        s->name, page);
- 
-       if (s->flags & DEBUG_DEFAULT_FLAGS) {
-               if (!PageSlubDebug(page))
-                       printk(KERN_ERR "SLUB %s: SlubDebug not set "
-                               "on slab 0x%p\n", s->name, page);
-       } else {
-               if (PageSlubDebug(page))
-                       printk(KERN_ERR "SLUB %s: SlubDebug set on "
-                               "slab 0x%p\n", s->name, page);
-       }
  }
  
  static int validate_slab_node(struct kmem_cache *s,
@@@ -4503,6 -4493,13 +4492,13 @@@ static int sysfs_slab_add(struct kmem_c
  
  static void sysfs_slab_remove(struct kmem_cache *s)
  {
+       if (slab_state < SYSFS)
+               /*
+                * Sysfs has not been setup yet so no need to remove the
+                * cache from sysfs.
+                */
+               return;
+ 
        kobject_uevent(&s->kobj, KOBJ_REMOVE);
        kobject_del(&s->kobj);
        kobject_put(&s->kobj);
@@@ -4548,8 -4545,11 +4544,11 @@@ static int __init slab_sysfs_init(void
        struct kmem_cache *s;
        int err;
  
+       down_write(&slub_lock);
+ 
        slab_kset = kset_create_and_add("slab", &slab_uevent_ops, kernel_kobj);
        if (!slab_kset) {
+               up_write(&slub_lock);
                printk(KERN_ERR "Cannot register slab subsystem.\n");
                return -ENOSYS;
        }
@@@ -4574,6 -4574,7 +4573,7 @@@
                kfree(al);
        }
  
+       up_write(&slub_lock);
        resiliency_test();
        return 0;
  }