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

File:

• kernel/generic/src/mm/frame.c (modified) (16 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. */
@@ -370 +373 @@
 {
         assert(zone->flags & ZONE_AVAILABLE);
+        assert(zone->free_count >= count);
 
         /* Allocate frames from zone */
@@ -410 +414 @@
 
         frame_t *frame = zone_get_frame(zone, index);
-
         assert(frame->refcount > 0);
 
         if (!--frame->refcount) {
+                assert(zone->busy_count > 0);
+
                 bitmap_set(&zone->bitmap, index, 0);
 
@@ -432 +437 @@
 
         frame_t *frame = zone_get_frame(zone, index);
+        assert(frame->refcount <= 1);
+
         if (frame->refcount > 0)
                 return;
 
+        assert(zone->free_count > 0);
+
         frame->refcount = 1;
         bitmap_set_range(&zone->bitmap, index, 1);
@@ -440 +449 @@
         zone->free_count--;
         reserve_force_alloc(1);
+}
+
+/** Mark frame in zone available to allocation. */
+_NO_TRACE static void zone_mark_available(zone_t *zone, size_t index)
+{
+        assert(zone->flags & ZONE_AVAILABLE);
+
+        frame_t *frame = zone_get_frame(zone, index);
+        assert(frame->refcount == 1);
+
+        frame->refcount = 0;
+        bitmap_set_range(&zone->bitmap, index, 0);
+
+        zone->free_count++;
 }
 
@@ -465 +488 @@
         /* Difference between zone bases */
         pfn_t base_diff = zones.info[z2].base - zones.info[z1].base;
+        pfn_t gap = base_diff - zones.info[z1].count;
 
         zones.info[z1].count = base_diff + zones.info[z2].count;
@@ -492 +516 @@
                     zones.info[z2].frames[i];
         }
+
+        /*
+         * Mark the gap between the original zones as unavailable.
+         */
+
+        for (size_t i = 0; i < gap; i++) {
+                frame_initialize(&zones.info[z1].frames[old_z1->count + i]);
+                zone_mark_unavailable(&zones.info[z1], old_z1->count + i);
+        }
 }
 
@@ -518 +551 @@
 
         for (size_t i = 0; i < cframes; i++)
-                (void) zone_frame_free(&zones.info[znum],
+                zone_mark_available(&zones.info[znum],
                     pfn - zones.info[znum].base + i);
 }
@@ -723 +756 @@
 
                                 if (overlaps(addr, PFN2ADDR(confcount),
-                                    KA2PA(config.stack_base), config.stack_size))
+                                    KA2PA(ballocs.base), ballocs.size))
                                         continue;
 
@@ -918 +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)
@@ -933 +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
@@ -994 +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)
@@ -1012 +1035 @@
         }
 
-        mutex_unlock(&mem_avail_mtx);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&mem_avail_lock, true);
 
         if (!(flags & FRAME_NO_RESERVE))
@@ -1078 +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();
@@ -1091 +1106 @@
                 frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
                     SIZE2FRAMES(config.kernel_size));
-                frame_mark_unavailable(ADDR2PFN(KA2PA(config.stack_base)),
-                    SIZE2FRAMES(config.stack_size));
 
                 for (size_t i = 0; i < init.cnt; i++)