Changeset 81e52f2a in mainline for generic/src/mm/slab.c

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.

File:

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

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);