Changeset c5613b72 in mainline for generic

Timestamp:

2006-02-04T01:59:42Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

10e16a7

Parents:

81e52f2a

Message:

Added slab stress test.
Fixed race condition in slab allocator.
Moved initialization of slab to the point where we know correct config.cpu_count
Correctly passes tests on amd64, ia32 in both bochs & qemu.

Location:

generic/src

Files:

• main/main.c (modified) (2 diffs)
• mm/slab.c (modified) (4 diffs)

generic/src/main/main.c

@@ -164 +164 @@
         page_init();
         tlb_init();
-        slab_cache_init();
         arch_post_mm_init();
 
@@ -174 +173 @@
         arch_pre_smp_init();
         smp_init();
+        /* Slab must be initialized AFTER we know the number of processors */
+        slab_cache_init();
+
         printf("config.memory_size=%dM\n", config.memory_size/(1024*1024));
         printf("config.cpu_count=%d\n", config.cpu_count);

generic/src/mm/slab.c

@@ -387 +387 @@
  * no empty magazine is available and cannot be allocated
  *
+ * Assume mag_cache[CPU->id].lock is held
+ *
  * We have 2 magazines bound to processor. 
  * First try the current. 
@@ -421 +423 @@
 
         /* Flush last to magazine list */
-        if (lastmag)
+        if (lastmag) {
+                spinlock_lock(&cache->lock);
                 list_prepend(&lastmag->link, &cache->magazines);
+                spinlock_unlock(&cache->lock);
+        }
         /* Move current as last, save new as current */
         cache->mag_cache[CPU->id].last = cmag;  
@@ -514 +519 @@
         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);
@@ -650 +655 @@
         ipl_t ipl;
         void *result = NULL;
-
+        
         /* Disable interrupts to avoid deadlocks with interrupt handlers */
         ipl = interrupts_disable();