Changes in kernel/generic/src/mm/frame.c [c626117:6188fee] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -63 +63 @@
 #include <proc/thread.h> /* THREAD */
 
-zones_t zones = {
-        .count = 0,
-        .lock = IRQ_SPINLOCK_INITIALIZER("frame.zones.lock"),
-};
+zones_t zones;
 
 /*
@@ -72 +69 @@
  * available.
  */
-static IRQ_SPINLOCK_INITIALIZE(mem_avail_lock);
-static CONDVAR_INITIALIZE(mem_avail_cv);
+static mutex_t mem_avail_mtx;
+static condvar_t mem_avail_cv;
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
 static size_t mem_avail_gen = 0;  /**< Generation counter. */
@@ -951 +948 @@
 #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 +963 @@
 
                 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 +1024 @@
         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 +1042 @@
         }
 
-        irq_spinlock_unlock(&mem_avail_lock, true);
+        mutex_unlock(&mem_avail_mtx);
+        interrupts_restore(ipl);
 
         if (!(flags & FRAME_NO_RESERVE))
@@ -1100 +1108 @@
 void frame_init(void)
 {
+        if (config.cpu_active == 1) {
+                zones.count = 0;
+                irq_spinlock_initialize(&zones.lock, "frame.zones.lock");
+                mutex_initialize(&mem_avail_mtx, MUTEX_ACTIVE);
+                condvar_initialize(&mem_avail_cv);
+        }
+
         /* Tell the architecture to create some memory */
         frame_low_arch_init();