Patched in Tegra support.

1 files changed, 165 insertions, 94 deletions

diff --git a/mm/slob.c b/mm/slob.c
index a99fdf7a090..bf391818716 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -28,8 +28,9 @@
  * 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.
- * These objects are detected in kfree() because PageSlab()
+ * 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()
  * is false for them.
  *
  * SLAB is emulated on top of SLOB by simply calling constructors and
@@ -58,12 +59,11 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
-
 #include <linux/mm.h>
 #include <linux/swap.h> /* struct reclaim_state */
 #include <linux/cache.h>
 #include <linux/init.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 #include <linux/kmemleak.h>
@@ -72,7 +72,6 @@
 
 #include <linux/atomic.h>
 
-#include "slab.h"
 /*
  * slob_block has a field 'units', which indicates size of block if +ve,
  * or offset of next block if -ve (in SLOB_UNITs).
@@ -93,6 +92,36 @@ struct slob_block {
 typedef struct slob_block slob_t;
 
 /*
+ * We use struct page fields to manage some slob allocation aspects,
+ * however to avoid the horrible mess in include/linux/mm_types.h, we'll
+ * just define our own struct page type variant here.
+ */
+struct slob_page {
+        union {
+                struct {
+                        unsigned long flags;    /* mandatory */
+                        atomic_t _count;        /* mandatory */
+                        slobidx_t units;        /* free units left in page */
+                        unsigned long pad[2];
+                        slob_t *free;           /* first free slob_t in page */
+                        struct list_head list;  /* linked list of free pages */
+                };
+                struct page page;
+        };
+};
+static inline void struct_slob_page_wrong_size(void)
+{ BUILD_BUG_ON(sizeof(struct slob_page) != sizeof(struct page)); }
+
+/*
+ * free_slob_page: call before a slob_page is returned to the page allocator.
+ */
+static inline void free_slob_page(struct slob_page *sp)
+{
+        reset_page_mapcount(&sp->page);
+        sp->page.mapping = NULL;
+}
+
+/*
  * All partially free slob pages go on these lists.
  */
 #define SLOB_BREAK1 256
@@ -102,27 +131,51 @@ static LIST_HEAD(free_slob_medium);
 static LIST_HEAD(free_slob_large);
 
 /*
+ * is_slob_page: True for all slob pages (false for bigblock pages)
+ */
+static inline int is_slob_page(struct slob_page *sp)
+{
+        return PageSlab((struct page *)sp);
+}
+
+static inline void set_slob_page(struct slob_page *sp)
+{
+        __SetPageSlab((struct page *)sp);
+}
+
+static inline void clear_slob_page(struct slob_page *sp)
+{
+        __ClearPageSlab((struct page *)sp);
+}
+
+static inline struct slob_page *slob_page(const void *addr)
+{
+        return (struct slob_page *)virt_to_page(addr);
+}
+
+/*
  * slob_page_free: true for pages on free_slob_pages list.
  */
-static inline int slob_page_free(struct page *sp)
+static inline int slob_page_free(struct slob_page *sp)
 {
-        return PageSlobFree(sp);
+        return PageSlobFree((struct page *)sp);
 }
 
-static void set_slob_page_free(struct page *sp, struct list_head *list)
+static void set_slob_page_free(struct slob_page *sp, struct list_head *list)
 {
         list_add(&sp->list, list);
-        __SetPageSlobFree(sp);
+        __SetPageSlobFree((struct page *)sp);
 }
 
-static inline void clear_slob_page_free(struct page *sp)
+static inline void clear_slob_page_free(struct slob_page *sp)
 {
         list_del(&sp->list);
-        __ClearPageSlobFree(sp);
+        __ClearPageSlobFree((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
@@ -192,7 +245,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
         void *page;
 
 #ifdef CONFIG_NUMA
-        if (node != NUMA_NO_NODE)
+        if (node != -1)
                 page = alloc_pages_exact_node(node, gfp, order);
         else
 #endif
@@ -214,12 +267,12 @@ static void slob_free_pages(void *b, int order)
 /*
  * Allocate a slob block within a given slob_page sp.
  */
-static void *slob_page_alloc(struct page *sp, size_t size, int align)
+static void *slob_page_alloc(struct slob_page *sp, size_t size, int align)
 {
         slob_t *prev, *cur, *aligned = NULL;
         int delta = 0, units = SLOB_UNITS(size);
 
-        for (prev = NULL, cur = sp->freelist; ; prev = cur, cur = slob_next(cur)) {
+        for (prev = NULL, cur = sp->free; ; prev = cur, cur = slob_next(cur)) {
                 slobidx_t avail = slob_units(cur);
 
                 if (align) {
@@ -243,12 +296,12 @@ static void *slob_page_alloc(struct page *sp, size_t size, int align)
                                 if (prev)
                                         set_slob(prev, slob_units(prev), next);
                                 else
-                                        sp->freelist = next;
+                                        sp->free = next;
                         } else { /* fragment */
                                 if (prev)
                                         set_slob(prev, slob_units(prev), cur + units);
                                 else
-                                        sp->freelist = cur + units;
+                                        sp->free = cur + units;
                                 set_slob(cur + units, avail - units, next);
                         }
 
@@ -267,7 +320,7 @@ static void *slob_page_alloc(struct page *sp, size_t size, int align)
  */
 static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
 {
-        struct page *sp;
+        struct slob_page *sp;
         struct list_head *prev;
         struct list_head *slob_list;
         slob_t *b = NULL;
@@ -288,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
                  * If there's a node specification, search for a partial
                  * page with a matching node id in the freelist.
                  */
-                if (node != NUMA_NO_NODE && page_to_nid(sp) != node)
+                if (node != -1 && page_to_nid(&sp->page) != node)
                         continue;
 #endif
                 /* Enough room on this page? */
@@ -316,12 +369,12 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
                 b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
                 if (!b)
                         return NULL;
-                sp = virt_to_page(b);
-                __SetPageSlab(sp);
+                sp = slob_page(b);
+                set_slob_page(sp);
 
                 spin_lock_irqsave(&slob_lock, flags);
                 sp->units = SLOB_UNITS(PAGE_SIZE);
-                sp->freelist = b;
+                sp->free = b;
                 INIT_LIST_HEAD(&sp->list);
                 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
                 set_slob_page_free(sp, slob_list);
@@ -339,7 +392,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
  */
 static void slob_free(void *block, int size)
 {
-        struct page *sp;
+        struct slob_page *sp;
         slob_t *prev, *next, *b = (slob_t *)block;
         slobidx_t units;
         unsigned long flags;
@@ -349,7 +402,7 @@ static void slob_free(void *block, int size)
                 return;
         BUG_ON(!size);
 
-        sp = virt_to_page(block);
+        sp = slob_page(block);
         units = SLOB_UNITS(size);
 
         spin_lock_irqsave(&slob_lock, flags);
@@ -359,8 +412,8 @@ static void slob_free(void *block, int size)
                 if (slob_page_free(sp))
                         clear_slob_page_free(sp);
                 spin_unlock_irqrestore(&slob_lock, flags);
-                __ClearPageSlab(sp);
-                reset_page_mapcount(sp);
+                clear_slob_page(sp);
+                free_slob_page(sp);
                 slob_free_pages(b, 0);
                 return;
         }
@@ -368,7 +421,7 @@ static void slob_free(void *block, int size)
         if (!slob_page_free(sp)) {
                 /* This slob page is about to become partially free. Easy! */
                 sp->units = units;
-                sp->freelist = b;
+                sp->free = b;
                 set_slob(b, units,
                         (void *)((unsigned long)(b +
                                         SLOB_UNITS(PAGE_SIZE)) & PAGE_MASK));
@@ -388,15 +441,15 @@ static void slob_free(void *block, int size)
          */
         sp->units += units;
 
-        if (b < (slob_t *)sp->freelist) {
-                if (b + units == sp->freelist) {
-                        units += slob_units(sp->freelist);
-                        sp->freelist = slob_next(sp->freelist);
+        if (b < sp->free) {
+                if (b + units == sp->free) {
+                        units += slob_units(sp->free);
+                        sp->free = slob_next(sp->free);
                 }
-                set_slob(b, units, sp->freelist);
-                sp->freelist = b;
+                set_slob(b, units, sp->free);
+                sp->free = b;
         } else {
-                prev = sp->freelist;
+                prev = sp->free;
                 next = slob_next(prev);
                 while (b > next) {
                         prev = next;
@@ -423,11 +476,10 @@ out:
  * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
  */
 
-static __always_inline void *
-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 {
         unsigned int *m;
-        int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+        int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
         void *ret;
 
         gfp &= gfp_allowed_mask;
@@ -445,7 +497,7 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
                 *m = size;
                 ret = (void *)m + align;
 
-                trace_kmalloc_node(caller, ret,
+                trace_kmalloc_node(_RET_IP_, ret,
                                    size, size + align, gfp, node);
         } else {
                 unsigned int order = get_order(size);
@@ -453,39 +505,24 @@ __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,
+                trace_kmalloc_node(_RET_IP_, ret,
                                    size, PAGE_SIZE << order, gfp, node);
         }
 
         kmemleak_alloc(ret, size, 1, gfp);
         return ret;
 }
-
-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
-{
-        return __do_kmalloc_node(size, gfp, node, _RET_IP_);
-}
 EXPORT_SYMBOL(__kmalloc_node);
 
-#ifdef CONFIG_TRACING
-void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller)
-{
-        return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, caller);
-}
-
-#ifdef CONFIG_NUMA
-void *__kmalloc_node_track_caller(size_t size, gfp_t gfp,
-                                        int node, unsigned long caller)
-{
-        return __do_kmalloc_node(size, gfp, node, caller);
-}
-#endif
-#endif
-
 void kfree(const void *block)
 {
-        struct page *sp;
+        struct slob_page *sp;
 
         trace_kfree(_RET_IP_, block);
 
@@ -493,46 +530,81 @@ void kfree(const void *block)
                 return;
         kmemleak_free(block);
 
-        sp = virt_to_page(block);
-        if (PageSlab(sp)) {
-                int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+        sp = slob_page(block);
+        if (is_slob_page(sp)) {
+                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
                 unsigned int *m = (unsigned int *)(block - align);
                 slob_free(m, *m + align);
         } else
-                __free_pages(sp, compound_order(sp));
+                put_page(&sp->page);
 }
 EXPORT_SYMBOL(kfree);
 
 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
 size_t ksize(const void *block)
 {
-        struct page *sp;
-        int align;
-        unsigned int *m;
+        struct slob_page *sp;
 
         BUG_ON(!block);
         if (unlikely(block == ZERO_SIZE_PTR))
                 return 0;
 
-        sp = virt_to_page(block);
-        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;
+        sp = slob_page(block);
+        if (is_slob_page(sp)) {
+                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+                unsigned int *m = (unsigned int *)(block - align);
+                return SLOB_UNITS(*m) * SLOB_UNIT;
+        } else
+                return sp->page.private;
 }
 EXPORT_SYMBOL(ksize);
 
-int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
+struct kmem_cache {
+        unsigned int size, align;
+        unsigned long flags;
+        const char *name;
+        void (*ctor)(void *);
+};
+
+struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+        size_t align, unsigned long flags, void (*ctor)(void *))
 {
-        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;
-        return 0;
+        struct kmem_cache *c;
+
+        c = slob_alloc(sizeof(struct kmem_cache),
+                GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
+
+        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;
+                /* 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;
+        } else if (flags & SLAB_PANIC)
+                panic("Cannot create slab cache %s\n", name);
+
+        kmemleak_alloc(c, sizeof(struct kmem_cache), 1, GFP_KERNEL);
+        return c;
+}
+EXPORT_SYMBOL(kmem_cache_create);
+
+void kmem_cache_destroy(struct kmem_cache *c)
+{
+        kmemleak_free(c);
+        if (c->flags & SLAB_DESTROY_BY_RCU)
+                rcu_barrier();
+        slob_free(c, sizeof(struct kmem_cache));
 }
+EXPORT_SYMBOL(kmem_cache_destroy);
 
 void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
 {
@@ -544,12 +616,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->object_size,
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->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->object_size,
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
                                             PAGE_SIZE << get_order(c->size),
                                             flags, node);
         }
@@ -594,11 +666,11 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
 }
 EXPORT_SYMBOL(kmem_cache_free);
 
-int __kmem_cache_shutdown(struct kmem_cache *c)
+unsigned int kmem_cache_size(struct kmem_cache *c)
 {
-        /* No way to check for remaining objects */
-        return 0;
+        return c->size;
 }
+EXPORT_SYMBOL(kmem_cache_size);
 
 int kmem_cache_shrink(struct kmem_cache *d)
 {
@@ -606,20 +678,19 @@ int kmem_cache_shrink(struct kmem_cache *d)
 }
 EXPORT_SYMBOL(kmem_cache_shrink);
 
-struct kmem_cache kmem_cache_boot = {
-        .name = "kmem_cache",
-        .size = sizeof(struct kmem_cache),
-        .flags = SLAB_PANIC,
-        .align = ARCH_KMALLOC_MINALIGN,
-};
+static unsigned int slob_ready __read_mostly;
+
+int slab_is_available(void)
+{
+        return slob_ready;
+}
 
 void __init kmem_cache_init(void)
 {
-        kmem_cache = &kmem_cache_boot;
-        slab_state = UP;
+        slob_ready = 1;
 }
 
 void __init kmem_cache_init_late(void)
 {
-        slab_state = FULL;
+        /* Nothing to do */
 }