Changeset ddb56be in mainline

Timestamp:

2012-05-08T09:20:18Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4d194be

Parents:

c8d0f9e5

Message:

Convert slab_cache_t's slablock into an IRQ spinlock as it is taken from
a callpath called from slab_cache_destroy(), which does not disable
interrupts.

Location:

kernel/generic

Files:

• include/mm/slab.h (modified) (1 diff)
• src/mm/slab.c (modified) (8 diffs)

kernel/generic/include/mm/slab.h

@@ -113 +113 @@
         list_t full_slabs;     /**< List of full slabs */
         list_t partial_slabs;  /**< List of partial slabs */
-        SPINLOCK_DECLARE(slablock);
+        IRQ_SPINLOCK_DECLARE(slablock);
         /* Magazines */
         list_t magazines;  /**< List o full magazines */

kernel/generic/src/mm/slab.c

@@ -254 +254 @@
     slab_t *slab)
 {
-        ASSERT(interrupts_disabled());
-
         if (!slab)
                 slab = obj2slab(obj);
@@ -266 +264 @@
                 freed = cache->destructor(obj);
         
-        spinlock_lock(&cache->slablock);
+        irq_spinlock_lock(&cache->slablock, true);
         ASSERT(slab->available < cache->objects);
         
@@ -277 +275 @@
                 /* Free associated memory */
                 list_remove(&slab->link);
-                spinlock_unlock(&cache->slablock);
+                irq_spinlock_unlock(&cache->slablock, true);
                 
                 return freed + slab_space_free(cache, slab);
@@ -286 +284 @@
         }
         
-        spinlock_unlock(&cache->slablock);
+        irq_spinlock_unlock(&cache->slablock, true);
         return freed;
 }
@@ -297 +295 @@
 NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
 {
-        ASSERT(interrupts_disabled());
-
-        spinlock_lock(&cache->slablock);
+        irq_spinlock_lock(&cache->slablock, true);
         
         slab_t *slab;
@@ -312 +308 @@
                  *
                  */
-                spinlock_unlock(&cache->slablock);
+                irq_spinlock_unlock(&cache->slablock, true);
                 slab = slab_space_alloc(cache, flags);
                 if (!slab)
                         return NULL;
                 
-                spinlock_lock(&cache->slablock);
+                irq_spinlock_lock(&cache->slablock, true);
         } else {
                 slab = list_get_instance(list_first(&cache->partial_slabs),
@@ -333 +329 @@
                 list_prepend(&slab->link, &cache->partial_slabs);
         
-        spinlock_unlock(&cache->slablock);
+        irq_spinlock_unlock(&cache->slablock, true);
         
         if ((cache->constructor) && (cache->constructor(obj, flags))) {
@@ -632 +628 @@
         list_initialize(&cache->magazines);
         
-        spinlock_initialize(&cache->slablock, "slab.cache.slablock");
+        irq_spinlock_initialize(&cache->slablock, "slab.cache.slablock");
         spinlock_initialize(&cache->maglock, "slab.cache.maglock");