Changeset 81e52f2a in mainline

Timestamp:

2006-02-04T00:53:19Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c5613b7

Parents:

c352c2e

Message:

Fixed non-initialized cpu-cache.

Files:

• generic/include/bitops.h (modified) (2 diffs)
• generic/src/mm/slab.c (modified) (5 diffs)
• test/mm/slab1/test.c (modified) (3 diffs)

generic/include/bitops.h

@@ -41 +41 @@
         int n = 0;
 
-        if (arg & 0xffff0000) { arg >>= 16;n += 16;}
-        if (arg & 0xff00) { arg >>= 8; n += 8;}
-        if (arg & 0xf0) { arg >>= 4; n += 4;}
-        if (arg & 0xc) { arg >>= 2; n+=2;}
-        if (arg & 0x2) { arg >>= 1; n+=1;}
+        if (arg >> 16) { arg >>= 16;n += 16;}
+        if (arg >> 8) { arg >>= 8; n += 8;}
+        if (arg >> 4) { arg >>= 4; n += 4;}
+        if (arg >> 2) { arg >>= 2; n+=2;}
+        if (arg >> 1) { arg >>= 1; n+=1;}
         return n;
 }
@@ -53 +53 @@
         int n = 0;
 
-        /* This is because mips complains about big numbers,
-         * other platforms should optimize it out */
-        __u64 oper = 0xffffffff;
-        oper <<= 32;
-
-        if (arg & oper) { arg >>= 32;n += 32;}
+        if (arg >> 32) { arg >>= 32;n += 32;}
         return n + fnzb32((__u32) arg);
 }

generic/src/mm/slab.c

@@ -366 +366 @@
         void *obj;
 
+        if (!CPU)
+                return NULL;
+
         spinlock_lock(&cache->mag_cache[CPU->id].lock);
 
@@ -436 +439 @@
         slab_magazine_t *mag;
 
+        if (!CPU)
+                return -1;
+
         spinlock_lock(&cache->mag_cache[CPU->id].lock);
 
@@ -508 +514 @@
         spinlock_initialize(&cache->lock, "cachelock");
         if (! (cache->flags & SLAB_CACHE_NOMAGAZINE)) {
-                for (i=0; i< config.cpu_count; i++)
+                for (i=0; i< config.cpu_count; i++) {
+                        memsetb((__address)&cache->mag_cache[i],
+                                sizeof(cache->mag_cache[i]), 0);
                         spinlock_initialize(&cache->mag_cache[i].lock, 
                                             "cpucachelock");
+                }
         }
 
@@ -645 +654 @@
         ipl = interrupts_disable();
 
-        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE) && CPU)
+        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
                 result = magazine_obj_get(cache);
 
@@ -670 +679 @@
 
         if ((cache->flags & SLAB_CACHE_NOMAGAZINE) \
-            || !CPU \
             || magazine_obj_put(cache, obj)) {
-                
                 spinlock_lock(&cache->lock);
                 slab_obj_destroy(cache, obj, slab);

test/mm/slab1/test.c

@@ -46 +46 @@
         printf("Creating cache, object size: %d.\n", size);
         cache = slab_cache_create("test_cache", size, 0, NULL, NULL, 
-                                  SLAB_CACHE_NOMAGAZINE);
-        slab_print_list();
-        
+                                  SLAB_CACHE_NOMAGAZINE);       
         printf("Allocating %d items...", count);
         for (i=0; i < count; i++) {
@@ -68 +66 @@
         printf("done.\n");
 
-        slab_print_list();
         printf("Freeing %d items...", count/2);
         for (i=count-1; i >= count/2; i--) {
@@ -129 +126 @@
         }
         printf("Thread #%d finished\n", THREAD->tid);
-        slab_print_list();
         semaphore_up(&thr_sem);
 }