Changes in kernel/generic/src/mm/frame.c [6188fee:c626117] 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;
+zones_t zones = {
+        .count = 0,
+        .lock = IRQ_SPINLOCK_INITIALIZER("frame.zones.lock"),
+};
 
 /*
@@ -69 +72 @@
  * available.
  */
-static mutex_t mem_avail_mtx;
-static condvar_t mem_avail_cv;
+static IRQ_SPINLOCK_INITIALIZE(mem_avail_lock);
+static CONDVAR_INITIALIZE(mem_avail_cv);
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
 static size_t mem_avail_gen = 0;  /**< Generation counter. */
@@ -948 +951 @@
 #endif
 
-                /*
-                 * 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);
+                /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
+                irq_spinlock_lock(&mem_avail_lock, true);
 
                 if (mem_avail_req > 0)
@@ -963 +962 @@
 
                 while (gen == mem_avail_gen)
-                        condvar_wait(&mem_avail_cv, &mem_avail_mtx);
-
-                mutex_unlock(&mem_avail_mtx);
-                interrupts_restore(ipl);
+                        condvar_wait(&mem_avail_cv, &mem_avail_lock);
+
+                irq_spinlock_unlock(&mem_avail_lock, true);
 
 #ifdef CONFIG_DEBUG
@@ -1024 +1022 @@
         irq_spinlock_unlock(&zones.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);
+        /* Signal that some memory has been freed. */
+
+        /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
+        irq_spinlock_lock(&mem_avail_lock, true);
 
         if (mem_avail_req > 0)
@@ -1042 +1035 @@
         }
 
-        mutex_unlock(&mem_avail_mtx);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&mem_avail_lock, true);
 
         if (!(flags & FRAME_NO_RESERVE))
@@ -1108 +1100 @@
 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();