Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

1 files changed, 43 insertions, 10 deletions

diff --git a/mm/slob.c b/mm/slob.c
index c6933bc19bcd..71976c5d40d3 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/timer.h>
+#include <linux/rcupdate.h>
 
 struct slob_block {
         int units;
@@ -53,6 +54,16 @@ struct bigblock {
 };
 typedef struct bigblock bigblock_t;
 
+/*
+ * struct slob_rcu is inserted at the tail of allocated slob blocks, which
+ * were created with a SLAB_DESTROY_BY_RCU slab. slob_rcu is used to free
+ * the block using call_rcu.
+ */
+struct slob_rcu {
+        struct rcu_head head;
+        int size;
+};
+
 static slob_t arena = { .next = &arena, .units = 1 };
 static slob_t *slobfree = &arena;
 static bigblock_t *bigblocks;
@@ -266,9 +277,9 @@ size_t ksize(const void *block)
 
 struct kmem_cache {
         unsigned int size, align;
+        unsigned long flags;
         const char *name;
         void (*ctor)(void *, struct kmem_cache *, unsigned long);
-        void (*dtor)(void *, struct kmem_cache *, unsigned long);
 };
 
 struct kmem_cache *kmem_cache_create(const char *name, size_t size,
@@ -283,8 +294,12 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
         if (c) {
                 c->name = name;
                 c->size = size;
+                if (flags & SLAB_DESTROY_BY_RCU) {
+                        /* leave room for rcu footer at the end of object */
+                        c->size += sizeof(struct slob_rcu);
+                }
+                c->flags = flags;
                 c->ctor = ctor;
-                c->dtor = dtor;
                 /* ignore alignment unless it's forced */
                 c->align = (flags & SLAB_HWCACHE_ALIGN) ? SLOB_ALIGN : 0;
                 if (c->align < align)
@@ -312,7 +327,7 @@ void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags)
                 b = (void *)__get_free_pages(flags, get_order(c->size));
 
         if (c->ctor)
-                c->ctor(b, c, SLAB_CTOR_CONSTRUCTOR);
+                c->ctor(b, c, 0);
 
         return b;
 }
@@ -328,15 +343,33 @@ void *kmem_cache_zalloc(struct kmem_cache *c, gfp_t flags)
 }
 EXPORT_SYMBOL(kmem_cache_zalloc);
 
-void kmem_cache_free(struct kmem_cache *c, void *b)
+static void __kmem_cache_free(void *b, int size)
 {
-        if (c->dtor)
-                c->dtor(b, c, 0);
-
-        if (c->size < PAGE_SIZE)
-                slob_free(b, c->size);
+        if (size < PAGE_SIZE)
+                slob_free(b, size);
         else
-                free_pages((unsigned long)b, get_order(c->size));
+                free_pages((unsigned long)b, get_order(size));
+}
+
+static void kmem_rcu_free(struct rcu_head *head)
+{
+        struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
+        void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
+
+        __kmem_cache_free(b, slob_rcu->size);
+}
+
+void kmem_cache_free(struct kmem_cache *c, void *b)
+{
+        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 {
+                __kmem_cache_free(b, c->size);
+        }
 }
 EXPORT_SYMBOL(kmem_cache_free);