Changeset 4d194be in mainline

Timestamp:

2012-05-08T09:31:18Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

905721b

Parents:

ddb56be

Message:

Convert slab_cache_t's maglock 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) (4 diffs)

kernel/generic/include/mm/slab.h

@@ -116 +116 @@
         /* Magazines */
         list_t magazines;  /**< List o full magazines */
-        SPINLOCK_DECLARE(maglock);
+        IRQ_SPINLOCK_DECLARE(maglock);
         
         /** CPU cache */

kernel/generic/src/mm/slab.c

@@ -355 +355 @@
         link_t *cur;
         
-        ASSERT(interrupts_disabled());
-
-        spinlock_lock(&cache->maglock);
+        irq_spinlock_lock(&cache->maglock, true);
         if (!list_empty(&cache->magazines)) {
                 if (first)
@@ -368 +366 @@
                 atomic_dec(&cache->magazine_counter);
         }
-        spinlock_unlock(&cache->maglock);
+        irq_spinlock_unlock(&cache->maglock, true);
 
         return mag;
@@ -379 +377 @@
     slab_magazine_t *mag)
 {
-        ASSERT(interrupts_disabled());
-
-        spinlock_lock(&cache->maglock);
+        irq_spinlock_lock(&cache->maglock, true);
         
         list_prepend(&mag->link, &cache->magazines);
         atomic_inc(&cache->magazine_counter);
         
-        spinlock_unlock(&cache->maglock);
+        irq_spinlock_unlock(&cache->maglock, true);
 }
 
@@ -629 +625 @@
         
         irq_spinlock_initialize(&cache->slablock, "slab.cache.slablock");
-        spinlock_initialize(&cache->maglock, "slab.cache.maglock");
+        irq_spinlock_initialize(&cache->maglock, "slab.cache.maglock");
         
         if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))