Changeset 4a5b2b0e in mainline

Timestamp:

2006-02-02T22:38:13Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

086a600

Parents:

14e5d88

Message:

Partially working SLAB CPU cache.

Files:

• generic/include/mm/slab.h (modified) (1 diff)
• generic/src/mm/slab.c (modified) (10 diffs)
• kernel.config (modified) (1 diff)
• test/mm/slab2/test.c (added)

generic/include/mm/slab.h

@@ -76 +76 @@
         atomic_t allocated_slabs;
         atomic_t allocated_objs;
+        atomic_t cached_objs;
 
         /* Slabs */

generic/src/mm/slab.c

@@ -97 +97 @@
         slab->available = cache->objects;
         slab->nextavail = 0;
+        slab->cache = cache;
 
         for (i=0; i<cache->objects;i++)
@@ -151 +152 @@
         if (!slab)
                 slab = obj2slab(obj);
+
+        ASSERT(slab->cache == cache);
 
         *((int *)obj) = slab->nextavail;
@@ -231 +234 @@
         count_t frames = 0;
 
-        for (i=0;i < mag->busy; i++)
+        for (i=0;i < mag->busy; i++) {
                 frames += slab_obj_destroy(cache, mag->objs[i], NULL);
+                atomic_dec(&cache->cached_objs);
+        }
         
         slab_free(&mag_cache, mag);
@@ -247 +252 @@
 {
         slab_magazine_t *mag;
+        void *obj;
 
         spinlock_lock(&cache->mag_cache[CPU->id].lock);
@@ -280 +286 @@
         }
 gotit:
+        obj = mag->objs[--mag->busy];
         spinlock_unlock(&cache->mag_cache[CPU->id].lock);
-        return mag->objs[--mag->busy];
+        atomic_dec(&cache->cached_objs);
+        
+        return obj;
 out:    
         spinlock_unlock(&cache->mag_cache[CPU->id].lock);
@@ -338 +347 @@
 
         spinlock_unlock(&cache->mag_cache[CPU->id].lock);
+        atomic_inc(&cache->cached_objs);
         return 0;
 errout:
@@ -468 +478 @@
         if (flags & SLAB_RECLAIM_ALL) {
                 /* Aggressive memfree */
-
                 /* Destroy CPU magazines */
                 for (i=0; i<config.cpu_count; i++) {
@@ -484 +493 @@
         /* Destroy full magazines */
         cur=cache->magazines.prev;
+
         while (cur!=&cache->magazines) {
                 mag = list_get_instance(cur, slab_magazine_t, link);
@@ -489 +499 @@
                 cur = cur->prev;
                 list_remove(cur->next);
+//              list_remove(&mag->link);
                 frames += magazine_destroy(cache,mag);
                 /* If we do not do full reclaim, break
@@ -597 +608 @@
 
         spinlock_lock(&slab_cache_lock);
-        printf("SLAB name\tOsize\tPages\tOcnt\tSlabs\tAllocobjs\tCtl\n");
+        printf("SLAB name\tOsize\tPages\tObj/pg\tSlabs\tCached\tAllocobjs\tCtl\n");
         for (cur = slab_cache_list.next;cur!=&slab_cache_list; cur=cur->next) {
                 cache = list_get_instance(cur, slab_cache_t, link);
-                printf("%s\t%d\t%d\t%d\t%d\t%d\t\t%s\n", cache->name, cache->size, 
+                printf("%s\t%d\t%d\t%d\t%d\t%d\t%d\t\t%s\n", cache->name, cache->size, 
                        (1 << cache->order), cache->objects,
-                       atomic_get(&cache->allocated_slabs), 
+                       atomic_get(&cache->allocated_slabs),
+                       atomic_get(&cache->cached_objs),
                        atomic_get(&cache->allocated_objs),
                        cache->flags & SLAB_CACHE_SLINSIDE ? "In" : "Out");

kernel.config

@@ -81 +81 @@
 @ "mm/falloc1" Frame Allocation test 1
 @ "mm/falloc2" Frame Allocation test 2
-@ "mm/slab1" SLAB Allocator test 1
+@ "mm/slab1" SLAB test1 - No CPU-cache
+@ "mm/slab2" SLAB test2 - SMP CPU cache
 @ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
 ! CONFIG_TEST (choice)