Changes in kernel/generic/src/mm/frame.c [c626117:597fa24] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -72 +72 @@
  * available.
  */
-static IRQ_SPINLOCK_INITIALIZE(mem_avail_lock);
+static MUTEX_INITIALIZE(mem_avail_mtx, MUTEX_ACTIVE);
 static CONDVAR_INITIALIZE(mem_avail_cv);
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
@@ -951 +951 @@
 #endif
 
-                /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
-                irq_spinlock_lock(&mem_avail_lock, true);
+                /*
+                 * Since the mem_avail_mtx is an active mutex, we need to
+                 * disable interrupts to prevent deadlock with TLB shootdown.
+                 */
+                ipl_t ipl = interrupts_disable();
+                mutex_lock(&mem_avail_mtx);
 
                 if (mem_avail_req > 0)
@@ -962 +966 @@
 
                 while (gen == mem_avail_gen)
-                        condvar_wait(&mem_avail_cv, &mem_avail_lock);
-
-                irq_spinlock_unlock(&mem_avail_lock, true);
+                        condvar_wait(&mem_avail_cv, &mem_avail_mtx);
+
+                mutex_unlock(&mem_avail_mtx);
+                interrupts_restore(ipl);
 
 #ifdef CONFIG_DEBUG
@@ -1022 +1027 @@
         irq_spinlock_unlock(&zones.lock, true);
 
-        /* Signal that some memory has been freed. */
-
-        /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
-        irq_spinlock_lock(&mem_avail_lock, true);
+        /*
+         * Signal that some memory has been freed.
+         * Since the mem_avail_mtx is an active mutex,
+         * we need to disable interruptsto prevent deadlock
+         * with TLB shootdown.
+         */
+
+        ipl_t ipl = interrupts_disable();
+        mutex_lock(&mem_avail_mtx);
 
         if (mem_avail_req > 0)
@@ -1035 +1045 @@
         }
 
-        irq_spinlock_unlock(&mem_avail_lock, true);
+        mutex_unlock(&mem_avail_mtx);
+        interrupts_restore(ipl);
 
         if (!(flags & FRAME_NO_RESERVE))