1 files changed, 13 insertions, 33 deletions

diff --git a/mm/slob.c b/mm/slob.c
index 1e921c5e9576..795bab7d391d 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -28,9 +28,8 @@
  * from kmalloc are prepended with a 4-byte header with the kmalloc size.
  * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
  * alloc_pages() directly, allocating compound pages so the page order
- * does not have to be separately tracked, and also stores the exact
- * allocation size in page->private so that it can be used to accurately
- * provide ksize(). These objects are detected in kfree() because slob_page()
+ * does not have to be separately tracked.
+ * These objects are detected in kfree() because PageSlab()
  * is false for them.
  *
  * SLAB is emulated on top of SLOB by simply calling constructors and
@@ -124,7 +123,6 @@ static inline void clear_slob_page_free(struct page *sp)
 
 #define SLOB_UNIT sizeof(slob_t)
 #define SLOB_UNITS(size) (((size) + SLOB_UNIT - 1)/SLOB_UNIT)
-#define SLOB_ALIGN L1_CACHE_BYTES
 
 /*
  * struct slob_rcu is inserted at the tail of allocated slob blocks, which
@@ -455,11 +453,6 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
                 if (likely(order))
                         gfp |= __GFP_COMP;
                 ret = slob_new_pages(gfp, order, node);
-                if (ret) {
-                        struct page *page;
-                        page = virt_to_page(ret);
-                        page->private = size;
-                }
 
                 trace_kmalloc_node(caller, ret,
                                    size, PAGE_SIZE << order, gfp, node);
@@ -506,7 +499,7 @@ void kfree(const void *block)
                 unsigned int *m = (unsigned int *)(block - align);
                 slob_free(m, *m + align);
         } else
-                put_page(sp);
+                __free_pages(sp, compound_order(sp));
 }
 EXPORT_SYMBOL(kfree);
 
@@ -514,37 +507,30 @@ EXPORT_SYMBOL(kfree);
 size_t ksize(const void *block)
 {
         struct page *sp;
+        int align;
+        unsigned int *m;
 
         BUG_ON(!block);
         if (unlikely(block == ZERO_SIZE_PTR))
                 return 0;
 
         sp = virt_to_page(block);
-        if (PageSlab(sp)) {
-                int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
-                unsigned int *m = (unsigned int *)(block - align);
-                return SLOB_UNITS(*m) * SLOB_UNIT;
-        } else
-                return sp->private;
+        if (unlikely(!PageSlab(sp)))
+                return PAGE_SIZE << compound_order(sp);
+
+        align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+        m = (unsigned int *)(block - align);
+        return SLOB_UNITS(*m) * SLOB_UNIT;
 }
 EXPORT_SYMBOL(ksize);
 
 int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
 {
-        size_t align = c->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;
-        /* ignore alignment unless it's forced */
-        c->align = (flags & SLAB_HWCACHE_ALIGN) ? SLOB_ALIGN : 0;
-        if (c->align < ARCH_SLAB_MINALIGN)
-                c->align = ARCH_SLAB_MINALIGN;
-        if (c->align < align)
-                c->align = align;
-
         return 0;
 }
 
@@ -558,12 +544,12 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
 
         if (c->size < PAGE_SIZE) {
                 b = slob_alloc(c->size, flags, c->align, node);
-                trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
                                             SLOB_UNITS(c->size) * SLOB_UNIT,
                                             flags, node);
         } else {
                 b = slob_new_pages(flags, get_order(c->size), node);
-                trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
                                             PAGE_SIZE << get_order(c->size),
                                             flags, node);
         }
@@ -608,12 +594,6 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
 }
 EXPORT_SYMBOL(kmem_cache_free);
 
-unsigned int kmem_cache_size(struct kmem_cache *c)
-{
-        return c->size;
-}
-EXPORT_SYMBOL(kmem_cache_size);
-
 int __kmem_cache_shutdown(struct kmem_cache *c)
 {
         /* No way to check for remaining objects */