Changeset c352c2e in mainline for generic/src/mm/slab.c

Timestamp:

2006-02-03T23:16:27Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

81e52f2a

Parents:

e1888f9

Message:

Implemented malloc/free as SLABs.

File:

• generic/src/mm/slab.c (modified) (9 diffs)

generic/src/mm/slab.c

@@ -93 +93 @@
 #include <panic.h>
 #include <debug.h>
+#include <bitops.h>
 
 SPINLOCK_INITIALIZE(slab_cache_lock);
@@ -109 +110 @@
  */
 static slab_cache_t *slab_extern_cache;
+/** Caches for malloc */
+static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W-SLAB_MIN_MALLOC_W+1];
+char *malloc_names[] =  {
+        "malloc-8","malloc-16","malloc-32","malloc-64","malloc-128",
+        "malloc-256","malloc-512","malloc-1K","malloc-2K",
+        "malloc-4K","malloc-8K","malloc-16K","malloc-32K",
+        "malloc-64K","malloc-128K"
+};
 
 /** Slab descriptor */
@@ -479 +488 @@
 {
         int i;
+        int pages;
 
         memsetb((__address)cache, sizeof(*cache), 0);
@@ -508 +518 @@
 
         /* Minimum slab order */
-        cache->order = (cache->size-1) >> PAGE_WIDTH;
+        pages = ((cache->size-1) >> PAGE_WIDTH) + 1;
+        cache->order = fnzb(pages);
 
         while (badness(cache) > SLAB_MAX_BADNESS(cache)) {
@@ -633 +644 @@
         /* Disable interrupts to avoid deadlocks with interrupt handlers */
         ipl = interrupts_disable();
-        
-        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
+
+        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE) && CPU)
                 result = magazine_obj_get(cache);
 
@@ -651 +662 @@
 }
 
-/** Return object to cache  */
-void slab_free(slab_cache_t *cache, void *obj)
+/** Return object to cache, use slab if known  */
+static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
         ipl_t ipl;
@@ -659 +670 @@
 
         if ((cache->flags & SLAB_CACHE_NOMAGAZINE) \
+            || !CPU \
             || magazine_obj_put(cache, obj)) {
                 
                 spinlock_lock(&cache->lock);
-                slab_obj_destroy(cache, obj, NULL);
+                slab_obj_destroy(cache, obj, slab);
                 spinlock_unlock(&cache->lock);
         }
         interrupts_restore(ipl);
         atomic_dec(&cache->allocated_objs);
+}
+
+/** Return slab object to cache */
+void slab_free(slab_cache_t *cache, void *obj)
+{
+        _slab_free(cache,obj,NULL);
 }
 
@@ -711 +729 @@
 void slab_cache_init(void)
 {
+        int i, size;
+
         /* Initialize magazine cache */
         _slab_cache_create(&mag_cache,
@@ -732 +752 @@
 
         /* Initialize structures for malloc */
-}
+        for (i=0, size=(1<<SLAB_MIN_MALLOC_W);
+             i < (SLAB_MAX_MALLOC_W-SLAB_MIN_MALLOC_W+1);
+             i++, size <<= 1) {
+                malloc_caches[i] = slab_cache_create(malloc_names[i],
+                                                     size, 0,
+                                                     NULL,NULL,0);
+        }
+}
+
+/**************************************/
+/* kalloc/kfree functions             */
+void * kalloc(unsigned int size, int flags)
+{
+        int idx;
+
+        ASSERT( size && size <= (1 << SLAB_MAX_MALLOC_W));
+        
+        if (size < (1 << SLAB_MIN_MALLOC_W))
+                size = (1 << SLAB_MIN_MALLOC_W);
+
+        idx = fnzb(size-1) - SLAB_MIN_MALLOC_W + 1;
+
+        return slab_alloc(malloc_caches[idx], flags);
+}
+
+
+void kfree(void *obj)
+{
+        slab_t *slab = obj2slab(obj);
+        
+        _slab_free(slab->cache, obj, slab);
+}