WebSVN – HelenOS – Diff – /branches/tracing/kernel/generic/src/mm/frame.c

 #include <mm/as.h>
 #include <panic.h>
 #include <debug.h>
 #include <adt/list.h>
 #include <synch/spinlock.h>
+#include <synch/mutex.h>
+#include <synch/condvar.h>
 #include <arch/asm.h>
 #include <arch.h>
 #include <print.h>
 #include <align.h>
 #include <mm/slab.h>
     zone_t *info[ZONES_MAX];
 } zones_t;
 static zones_t zones;
+/*
+ * Synchronization primitives used to sleep when there is no memory
+ * available.
+ */
+mutex_t mem_avail_mtx;
+condvar_t mem_avail_cv;
+unsigned long mem_avail_frames = 0; /**< Number of available frames. */
+unsigned long mem_avail_gen = 0;    /**< Generation counter. */
 /********************/
 /* Helper functions */
 /********************/
 static index_t make_frame_index(zone_t *zone, frame_t *frame)
+{
     return (frame - zone->frames);
+}
-/** Initialize frame structure
+/** Initialize frame structure.
- *
- * Initialize frame structure.
+ *
- * @param frame Frame structure to be initialized.
+ * @param frame     Frame structure to be initialized.
  */
 static void frame_initialize(frame_t *frame)
+{
     frame->refcount = 1;
     frame->buddy_order = 0;
 /**********************/
 /* Zoneinfo functions */
 /**********************/
-/**
- * Insert-sort zone into zones list
+/** Insert-sort zone into zones list.
+ *
- * @param newzone New zone to be inserted into zone list
+ * @param newzone   New zone to be inserted into zone list.
- * @return zone number on success, -1 on error
+ * @return      Zone number on success, -1 on error.
  */
 static int zones_add_zone(zone_t *newzone)
+{
     unsigned int i, j;
     ipl_t ipl;
+    }
     for (i = 0; i < zones.count; i++) {
         /* Check for overflow */
         z = zones.info[i];
-        if (overlaps(newzone->base, newzone->count, z->base, z->count)) {
+        if (overlaps(newzone->base, newzone->count, z->base,
+            z->count)) {
             printf("Zones overlap!\n");
             return -1;
+        }
         if (newzone->base < z->base)
             break;
     interrupts_restore(ipl);
     return i;
+}
-/**
- * Try to find a zone where can we find the frame
+/** Try to find a zone where can we find the frame.
+ *
  * Assume interrupts are disabled.
+ *
- * @param frame Frame number contained in zone
+ * @param frame     Frame number contained in zone.
- * @param pzone If not null, it is used as zone hint. Zone index
+ * @param pzone     If not null, it is used as zone hint. Zone index is
- *              is filled into the variable on success.
+ *          filled into the variable on success.
- * @return Pointer to locked zone containing frame
+ * @return      Pointer to locked zone containing frame.
  */
-static zone_t * find_zone_and_lock(pfn_t frame, unsigned int *pzone)
+static zone_t *find_zone_and_lock(pfn_t frame, unsigned int *pzone)
+{
     unsigned int i;
     unsigned int hint = pzone ? *pzone : 0;
     zone_t *z;
         spinlock_unlock(&z->lock);
         i++;
         if (i >= zones.count)
             i = 0;
-    } while(i != hint);
+    } while (i != hint);
     spinlock_unlock(&zones.lock);
     return NULL;
+}
 /** Find and lock zone that can allocate order frames.
+ *
  * Assume interrupts are disabled.
+ *
- * @param order Size (2^order) of free space we are trying to find
+ * @param order     Size (2^order) of free space we are trying to find.
+ * @param flags     Required flags of the target zone.
- * @param pzone Pointer to preferred zone or NULL, on return contains zone
+ * @param pzone     Pointer to preferred zone or NULL, on return contains
- *      number
+ *          zone number.
  */
+static zone_t *
-static zone_t * find_free_zone_and_lock(uint8_t order, unsigned int *pzone)
+find_free_zone_and_lock(uint8_t order, int flags, unsigned int *pzone)
+{
     unsigned int i;
     zone_t *z;
     unsigned int hint = pzone ? *pzone : 0;
+    /* Mask off flags that are not applicable. */
+    flags &= FRAME_LOW_4_GiB;
     spinlock_lock(&zones.lock);
     if (hint >= zones.count)
         hint = 0;
     i = hint;
     do {
         z = zones.info[i];
         spinlock_lock(&z->lock);
+        /*
+         * Check whether the zone meets the search criteria.
+         */
+        if ((z->flags & flags) == flags) {
+            /*
-        /* Check if the zone has 2^order frames area available  */
+             * Check if the zone has 2^order frames area available.
+             */
-        if (zone_can_alloc(z, order)) {
+            if (zone_can_alloc(z, order)) {
-            spinlock_unlock(&zones.lock);
+                spinlock_unlock(&zones.lock);
-            if (pzone)
+                if (pzone)
-                *pzone = i;
+                    *pzone = i;
-            return z;
+                return z;
+            }
+        }
         spinlock_unlock(&z->lock);
         if (++i >= zones.count)
             i = 0;
-    } while(i != hint);
+    } while (i != hint);
     spinlock_unlock(&zones.lock);
     return NULL;
+}
 /**************************/
 /* Buddy system functions */
 /**************************/
-/** Buddy system find_block implementation
+/** Buddy system find_block implementation.
+ *
  * Find block that is parent of current list.
  * That means go to lower addresses, until such block is found
+ *
- * @param order - Order of parent must be different then this parameter!!
+ * @param order     Order of parent must be different then this
+ *          parameter!!
  */
 static link_t *zone_buddy_find_block(buddy_system_t *b, link_t *child,
     uint8_t order)
+{
     frame_t *frame;
+        }
     } while(index-- > 0);
     return NULL;
+}
-static void zone_buddy_print_id(buddy_system_t *b, link_t *block)
-{
-    frame_t *frame;
-    zone_t *zone;
-    index_t index;
-    frame = list_get_instance(block, frame_t, buddy_link);
-    zone = (zone_t *) b->data;
-    index = frame_index(zone, frame);
-    printf("%" PRIi, index);
-}
-/** Buddy system find_buddy implementation
+/** Buddy system find_buddy implementation.
+ *
- * @param b Buddy system.
+ * @param b     Buddy system.
- * @param block Block for which buddy should be found
+ * @param block     Block for which buddy should be found.
+ *
- * @return Buddy for given block if found
+ * @return      Buddy for given block if found.
  */
 static link_t *zone_buddy_find_buddy(buddy_system_t *b, link_t *block)
+{
     frame_t *frame;
     zone_t *zone;
     is_left = IS_BUDDY_LEFT_BLOCK_ABS(zone, frame);
     is_right = IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame);
     ASSERT(is_left ^ is_right);
     if (is_left) {
-        index = (frame_index(zone, frame)) + (1 << frame->buddy_order);
+        index = (frame_index(zone, frame)) +
+            (1 << frame->buddy_order);
     } else {    /* if (is_right) */
-        index = (frame_index(zone, frame)) - (1 << frame->buddy_order);
+        index = (frame_index(zone, frame)) -
+            (1 << frame->buddy_order);
+    }
     if (frame_index_valid(zone, index)) {
         if (zone->frames[index].buddy_order == frame->buddy_order &&
             zone->frames[index].refcount == 0) {
+    }
     return NULL;
+}
-/** Buddy system bisect implementation
+/** Buddy system bisect implementation.
+ *
- * @param b Buddy system.
+ * @param b     Buddy system.
- * @param block Block to bisect
+ * @param block     Block to bisect.
+ *
- * @return right block
+ * @return      Right block.
  */
-static link_t * zone_buddy_bisect(buddy_system_t *b, link_t *block) {
+static link_t *zone_buddy_bisect(buddy_system_t *b, link_t *block)
+{
     frame_t *frame_l, *frame_r;
     frame_l = list_get_instance(block, frame_t, buddy_link);
     frame_r = (frame_l + (1 << (frame_l->buddy_order - 1)));
     return &frame_r->buddy_link;
+}
-/** Buddy system coalesce implementation
+/** Buddy system coalesce implementation.
+ *
- * @param b Buddy system.
+ * @param b     Buddy system.
- * @param block_1 First block
+ * @param block_1   First block.
- * @param block_2 First block's buddy
+ * @param block_2   First block's buddy.
+ *
- * @return Coalesced block (actually block that represents lower address)
+ * @return      Coalesced block (actually block that represents lower
+ *          address).
  */
 static link_t *zone_buddy_coalesce(buddy_system_t *b, link_t *block_1,
     link_t *block_2)
+{
     frame_t *frame1, *frame2;
     frame2 = list_get_instance(block_2, frame_t, buddy_link);
     return frame1 < frame2 ? block_1 : block_2;
+}
-/** Buddy system set_order implementation
+/** Buddy system set_order implementation.
+ *
- * @param b Buddy system.
+ * @param b     Buddy system.
- * @param block Buddy system block
+ * @param block     Buddy system block.
- * @param order Order to set
+ * @param order     Order to set.
  */
 static void zone_buddy_set_order(buddy_system_t *b, link_t *block,
-    uint8_t order) {
+    uint8_t order)
+{
     frame_t *frame;
     frame = list_get_instance(block, frame_t, buddy_link);
     frame->buddy_order = order;
+}
-/** Buddy system get_order implementation
+/** Buddy system get_order implementation.
+ *
- * @param b Buddy system.
+ * @param b     Buddy system.
- * @param block Buddy system block
+ * @param block     Buddy system block.
+ *
- * @return Order of block
+ * @return      Order of block.
  */
-static uint8_t zone_buddy_get_order(buddy_system_t *b, link_t *block) {
+static uint8_t zone_buddy_get_order(buddy_system_t *b, link_t *block)
+{
     frame_t *frame;
     frame = list_get_instance(block, frame_t, buddy_link);
     return frame->buddy_order;
+}
-/** Buddy system mark_busy implementation
+/** Buddy system mark_busy implementation.
- *
- * @param b Buddy system
- * @param block Buddy system block
+ *
+ * @param b     Buddy system.
+ * @param block     Buddy system block.
  */
-static void zone_buddy_mark_busy(buddy_system_t *b, link_t * block) {
+static void zone_buddy_mark_busy(buddy_system_t *b, link_t * block)
+{
     frame_t * frame;
     frame = list_get_instance(block, frame_t, buddy_link);
     frame->refcount = 1;
+}
-/** Buddy system mark_available implementation
+/** Buddy system mark_available implementation.
- *
- * @param b Buddy system
- * @param block Buddy system block
+ *
+ * @param b     Buddy system.
+ * @param block     Buddy system block.
  */
-static void zone_buddy_mark_available(buddy_system_t *b, link_t *block) {
+static void zone_buddy_mark_available(buddy_system_t *b, link_t *block)
+{
     frame_t *frame;
     frame = list_get_instance(block, frame_t, buddy_link);
     frame->refcount = 0;
+}
     .coalesce = zone_buddy_coalesce,
     .set_order = zone_buddy_set_order,
     .get_order = zone_buddy_get_order,
     .mark_busy = zone_buddy_mark_busy,
     .mark_available = zone_buddy_mark_available,
-    .find_block = zone_buddy_find_block,
+    .find_block = zone_buddy_find_block
-    .print_id = zone_buddy_print_id
 };
 /******************/
 /* Zone functions */
 /******************/
-/** Allocate frame in particular zone
+/** Allocate frame in particular zone.
+ *
- * Assume zone is locked
+ * Assume zone is locked.
  * Panics if allocation is impossible.
+ *
- * @param zone  Zone to allocate from.
+ * @param zone      Zone to allocate from.
- * @param order Allocate exactly 2^order frames.
+ * @param order     Allocate exactly 2^order frames.
+ *
- * @return Frame index in zone
+ * @return      Frame index in zone.
+ *
  */
 static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
+{
     pfn_t v;
     /* get frame address */
     v = make_frame_index(zone, frame);
     return v;
+}
-/** Free frame from zone
+/** Free frame from zone.
+ *
- * Assume zone is locked
+ * Assume zone is locked.
+ *
- * @param zone Pointer to zone from which the frame is to be freed
+ * @param zone      Pointer to zone from which the frame is to be freed.
- * @param frame_idx Frame index relative to zone
+ * @param frame_idx Frame index relative to zone.
  */
 static void zone_frame_free(zone_t *zone, index_t frame_idx)
+{
     frame_t *frame;
     uint8_t order;
         zone->free_count += (1 << order);
         zone->busy_count -= (1 << order);
+    }
+}
-/** Return frame from zone */
+/** Return frame from zone. */
-static frame_t * zone_get_frame(zone_t *zone, index_t frame_idx)
+static frame_t *zone_get_frame(zone_t *zone, index_t frame_idx)
+{
     ASSERT(frame_idx < zone->count);
     return &zone->frames[frame_idx];
+}
-/** Mark frame in zone unavailable to allocation */
+/** Mark frame in zone unavailable to allocation. */
 static void zone_mark_unavailable(zone_t *zone, index_t frame_idx)
+{
     frame_t *frame;
     link_t *link;
         return;
     link = buddy_system_alloc_block(zone->buddy_system,
         &frame->buddy_link);
     ASSERT(link);
     zone->free_count--;
+    mutex_lock(&mem_avail_mtx);
+    mem_avail_frames--;
+    mutex_unlock(&mem_avail_mtx);
+}
-/**
- * Join 2 zones
+/** Join two zones.
+ *
- * Expect zone_t *z to point to space at least zone_conf_size large
+ * Expect zone_t *z to point to space at least zone_conf_size large.
+ *
- * Assume z1 & z2 are locked
+ * Assume z1 & z2 are locked.
+ *
- * @param z Target zone structure pointer
+ * @param z     Target zone structure pointer.
- * @param z1 Zone to merge
+ * @param z1        Zone to merge.
- * @param z2 Zone to merge
+ * @param z2        Zone to merge.
  */
 static void _zone_merge(zone_t *z, zone_t *z1, zone_t *z2)
+{
     uint8_t max_order;
     unsigned int i;
         frame->refcount = 0;
         buddy_system_free(z->buddy_system, &frame->buddy_link);
+    }
+}
-/** Return old configuration frames into the zone
+/** Return old configuration frames into the zone.
+ *
  * We have several cases
  * - the conf. data is outside of zone -> exit, shall we call frame_free??
  * - the conf. data was created by zone_create or
  *   updated with reduce_region -> free every frame
+ *
- * @param newzone The actual zone where freeing should occur
+ * @param newzone   The actual zone where freeing should occur.
- * @param oldzone Pointer to old zone configuration data that should
+ * @param oldzone   Pointer to old zone configuration data that should
- *                be freed from new zone
+ *          be freed from new zone.
  */
 static void return_config_frames(zone_t *newzone, zone_t *oldzone)
+{
     pfn_t pfn;
     frame_t *frame;
         newzone->busy_count++;
         zone_frame_free(newzone, pfn+i-newzone->base);
+    }
+}
-/** Reduce allocated block to count of order 0 frames
+/** Reduce allocated block to count of order 0 frames.
+ *
  * The allocated block need 2^order frames of space. Reduce all frames
  * in block to order 0 and free the unneeded frames. This means, that
  * when freeing the previously allocated block starting with frame_idx,
  * you have to free every frame.
+ *
  * @param zone
- * @param frame_idx Index to block
+ * @param frame_idx     Index to block.
- * @param count Allocated space in block
+ * @param count         Allocated space in block.
  */
 static void zone_reduce_region(zone_t *zone, pfn_t frame_idx, count_t count)
+{
     count_t i;
     uint8_t order;
     for (i = count; i < (count_t) (1 << order); i++) {
         zone_frame_free(zone, i + frame_idx);
+    }
+}
-/** Merge zones z1 and z2
+/** Merge zones z1 and z2.
+ *
  * - the zones must be 2 zones with no zone existing in between,
  *   which means that z2 = z1+1
+ *
  * - When you create a new zone, the frame allocator configuration does
     spinlock_lock(&zones.lock);
     if ((z1 >= zones.count) || (z2 >= zones.count))
         goto errout;
     /* We can join only 2 zones with none existing inbetween */
-    if (z2-z1 != 1)
+    if (z2 - z1 != 1)
         goto errout;
     zone1 = zones.info[z1];
     zone2 = zones.info[z2];
     spinlock_lock(&zone1->lock);
 errout:
     spinlock_unlock(&zones.lock);
     interrupts_restore(ipl);
+}
-/**
- * Merge all zones into one big zone
+/** Merge all zones into one big zone.
+ *
  * It is reasonable to do this on systems whose bios reports parts in chunks,
  * so that we could have 1 zone (it's faster).
  */
 void zone_merge_all(void)
+{
     int count = zones.count;
     while (zones.count > 1 && --count) {
-        zone_merge(0,1);
+        zone_merge(0, 1);
         break;
+    }
+}
-/** Create frame zone
- *
- * Create new frame zone.
+/** Create new frame zone.
+ *
- * @param start Physical address of the first frame within the zone.
+ * @param start     Physical address of the first frame within the zone.
- * @param count Count of frames in zone
+ * @param count     Count of frames in zone.
- * @param z Address of configuration information of zone
+ * @param z     Address of configuration information of zone.
- * @param flags Zone flags.
+ * @param flags     Zone flags.
+ *
- * @return Initialized zone.
+ * @return      Initialized zone.
  */
 static void zone_construct(pfn_t start, count_t count, zone_t *z, int flags)
+{
     unsigned int i;
     uint8_t max_order;
     spinlock_initialize(&z->lock, "zone_lock");
     z->base = start;
     z->count = count;
+    /* Mask off flags that are calculated automatically. */
+    flags &= ~FRAME_LOW_4_GiB;
+    /* Determine calculated flags. */
+    if (z->base + count < (1ULL << (32 - FRAME_WIDTH))) /* 4 GiB */
+        flags |= FRAME_LOW_4_GiB;
     z->flags = flags;
     z->free_count = count;
     z->busy_count = 0;
     /*
      * Compute order for buddy system, initialize
      */
     max_order = fnzb(count);
     z->buddy_system = (buddy_system_t *)&z[1];
     buddy_system_create(z->buddy_system, max_order,
-                &zone_buddy_system_operations,
+        &zone_buddy_system_operations, (void *) z);
-                (void *) z);
     /* Allocate frames _after_ the conframe */
     /* Check sizes */
     z->frames = (frame_t *)((uint8_t *) z->buddy_system +
         buddy_conf_size(max_order));
         z->frames[i].refcount = 0;
         buddy_system_free(z->buddy_system, &z->frames[i].buddy_link);
+    }
+}
-/** Compute configuration data size for zone
+/** Compute configuration data size for zone.
+ *
- * @param count Size of zone in frames
+ * @param count     Size of zone in frames.
- * @return Size of zone configuration info (in bytes)
+ * @return      Size of zone configuration info (in bytes).
  */
 uintptr_t zone_conf_size(count_t count)
+{
     int size = sizeof(zone_t) + count * sizeof(frame_t);
     int max_order;
     max_order = fnzb(count);
     size += buddy_conf_size(max_order);
     return size;
+}
-/** Create and add zone to system
+/** Create and add zone to system.
+ *
- * @param start First frame number (absolute)
+ * @param start     First frame number (absolute).
- * @param count Size of zone in frames
+ * @param count     Size of zone in frames.
  * @param confframe Where configuration frames are supposed to be.
- *                  Automatically checks, that we will not disturb the
+ *          Automatically checks, that we will not disturb the
- *                  kernel and possibly init.
+ *          kernel and possibly init.  If confframe is given
- *                  If confframe is given _outside_ this zone, it is expected,
+ *          _outside_ this zone, it is expected, that the area is
- *                  that the area is already marked BUSY and big enough
+ *          already marked BUSY and big enough to contain
- *                  to contain zone_conf_size() amount of data.
+ *          zone_conf_size() amount of data.  If the confframe is
- *                  If the confframe is inside the area, the zone free frame
+ *          inside the area, the zone free frame information is
- *                  information is modified not to include it.
+ *          modified not to include it.
+ *
- * @return Zone number or -1 on error
+ * @return      Zone number or -1 on error.
  */
 int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags)
+{
     zone_t *z;
     uintptr_t addr;
     ASSERT(confframe);
     /* If conframe is supposed to be inside our zone, then make sure
      * it does not span kernel & init
      */
     confcount = SIZE2FRAMES(zone_conf_size(count));
-    if (confframe >= start && confframe < start+count) {
+    if (confframe >= start && confframe < start + count) {
-        for (;confframe < start + count; confframe++) {
+        for (; confframe < start + count; confframe++) {
             addr = PFN2ADDR(confframe);
             if (overlaps(addr, PFN2ADDR(confcount),
                 KA2PA(config.base), config.kernel_size))
                 continue;
     zone_construct(start, count, z, flags);
     znum = zones_add_zone(z);
     if (znum == -1)
         return -1;
+    mutex_lock(&mem_avail_mtx);
+    mem_avail_frames += count;
+    mutex_unlock(&mem_avail_mtx);
     /* If confdata in zone, mark as unavailable */
     if (confframe >= start && confframe < start + count)
         for (i = confframe; i < confframe + confcount; i++) {
             zone_mark_unavailable(z, i - z->base);
+        }
     return znum;
+}
 /***************************************/
 /* Frame functions */
-/** Set parent of frame */
+/** Set parent of frame. */
 void frame_set_parent(pfn_t pfn, void *data, unsigned int hint)
+{
     zone_t *zone = find_zone_and_lock(pfn, &hint);
     ASSERT(zone);
-    zone_get_frame(zone, pfn-zone->base)->parent = data;
+    zone_get_frame(zone, pfn - zone->base)->parent = data;
     spinlock_unlock(&zone->lock);
+}
 void *frame_get_parent(pfn_t pfn, unsigned int hint)
+{
     return res;
+}
 /** Allocate power-of-two frames of physical memory.
+ *
- * @param order  Allocate exactly 2^order frames.
+ * @param order     Allocate exactly 2^order frames.
- * @param flags  Flags for host zone selection and address processing.
+ * @param flags     Flags for host zone selection and address processing.
- * @param pzone  Preferred zone
+ * @param pzone     Preferred zone.
+ *
- * @return Physical address of the allocated frame.
+ * @return      Physical address of the allocated frame.
+ *
  */
-void * frame_alloc_generic(uint8_t order, int flags, unsigned int *pzone)
+void *frame_alloc_generic(uint8_t order, int flags, unsigned int *pzone)
+{
     ipl_t ipl;
     int freed;
     pfn_t v;
     zone_t *zone;
+    unsigned long gen = 0;
 loop:
     ipl = interrupts_disable();
     /*
      * First, find suitable frame zone.
      */
-    zone = find_free_zone_and_lock(order, pzone);
+    zone = find_free_zone_and_lock(order, flags, pzone);
     /* If no memory, reclaim some slab memory,
        if it does not help, reclaim all */
     if (!zone && !(flags & FRAME_NO_RECLAIM)) {
         freed = slab_reclaim(0);
         if (freed)
-            zone = find_free_zone_and_lock(order, pzone);
+            zone = find_free_zone_and_lock(order, flags, pzone);
         if (!zone) {
             freed = slab_reclaim(SLAB_RECLAIM_ALL);
             if (freed)
-                zone = find_free_zone_and_lock(order, pzone);
+                zone = find_free_zone_and_lock(order, flags,
+                    pzone);
+        }
+    }
     if (!zone) {
         /*
-         * TODO: Sleep until frames are available again.
+         * Sleep until some frames are available again.
          */
+        if (flags & FRAME_ATOMIC) {
-        interrupts_restore(ipl);
+            interrupts_restore(ipl);
-        if (flags & FRAME_ATOMIC)
             return 0;
+        }
+#ifdef CONFIG_DEBUG
+        unsigned long avail;
+        mutex_lock(&mem_avail_mtx);
+        avail = mem_avail_frames;
-        panic("Sleep not implemented.\n");
+        mutex_unlock(&mem_avail_mtx);
+        printf("Thread %" PRIu64 " waiting for %u frames, "
+            "%u available.\n", THREAD->tid, 1ULL << order, avail);
+#endif
+        mutex_lock(&mem_avail_mtx);
+        while ((mem_avail_frames < (1ULL << order)) ||
+            gen == mem_avail_gen)
+            condvar_wait(&mem_avail_cv, &mem_avail_mtx);
+        gen = mem_avail_gen;
+        mutex_unlock(&mem_avail_mtx);
+#ifdef CONFIG_DEBUG
+        mutex_lock(&mem_avail_mtx);
+        avail = mem_avail_frames;
+        mutex_unlock(&mem_avail_mtx);
+        printf("Thread %" PRIu64 " woken up, %u frames available.\n",
+            THREAD->tid, avail);
+#endif
+        interrupts_restore(ipl);
         goto loop;
+    }
     v = zone_frame_alloc(zone, order);
     v += zone->base;
     spinlock_unlock(&zone->lock);
+    mutex_lock(&mem_avail_mtx);
+    mem_avail_frames -= (1ULL << order);
+    mutex_unlock(&mem_avail_mtx);
     interrupts_restore(ipl);
     if (flags & FRAME_KA)
         return (void *)PA2KA(PFN2ADDR(v));
     return (void *)PFN2ADDR(v);
+ *
  * Find respective frame structure for supplied physical frame address.
  * Decrement frame reference count.
  * If it drops to zero, move the frame structure to free list.
+ *
- * @param Frame Physical Address of of the frame to be freed.
+ * @param frame     Physical Address of of the frame to be freed.
  */
 void frame_free(uintptr_t frame)
+{
     ipl_t ipl;
     zone_t *zone;
     pfn_t pfn = ADDR2PFN(frame);
     ipl = interrupts_disable();
     /*
      * First, find host frame zone for addr.
      */
-    zone = find_zone_and_lock(pfn,NULL);
+    zone = find_zone_and_lock(pfn, NULL);
     ASSERT(zone);
-    zone_frame_free(zone, pfn-zone->base);
+    zone_frame_free(zone, pfn - zone->base);
     spinlock_unlock(&zone->lock);
+    /*
+     * Signal that some memory has been freed.
+     */
+    mutex_lock(&mem_avail_mtx);
+    mem_avail_frames++;
+    mem_avail_gen++;
+    condvar_broadcast(&mem_avail_cv);
+    mutex_unlock(&mem_avail_mtx);
     interrupts_restore(ipl);
+}
 /** Add reference to frame.
+ *
  * Find respective frame structure for supplied PFN and
  * increment frame reference count.
+ *
- * @param pfn Frame number of the frame to be freed.
+ * @param pfn       Frame number of the frame to be freed.
  */
 void frame_reference_add(pfn_t pfn)
+{
     ipl_t ipl;
     zone_t *zone;
     ipl = interrupts_disable();
     /*
      * First, find host frame zone for addr.
      */
-    zone = find_zone_and_lock(pfn,NULL);
+    zone = find_zone_and_lock(pfn, NULL);
     ASSERT(zone);
-    frame = &zone->frames[pfn-zone->base];
+    frame = &zone->frames[pfn - zone->base];
     frame->refcount++;
     spinlock_unlock(&zone->lock);
     interrupts_restore(ipl);
+}
-/** Mark given range unavailable in frame zones */
+/** Mark given range unavailable in frame zones. */
 void frame_mark_unavailable(pfn_t start, count_t count)
+{
     unsigned int i;
     zone_t *zone;
     unsigned int prefzone = 0;
         spinlock_unlock(&zone->lock);
+    }
+}
-/** Initialize physical memory management
+/** Initialize physical memory management. */
- *
- * Initialize physical memory managemnt.
- */
 void frame_init(void)
+{
     if (config.cpu_active == 1) {
         zones.count = 0;
         spinlock_initialize(&zones.lock, "zones.lock");
+        mutex_initialize(&mem_avail_mtx, MUTEX_ACTIVE);
+        condvar_initialize(&mem_avail_cv);
+    }
     /* Tell the architecture to create some memory */
     frame_arch_init();
     if (config.cpu_active == 1) {
         frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
         frame_mark_unavailable(0, 1);
+    }
+}
-/** Return total size of all zones
+/** Return total size of all zones. */
- *
- */
-uint64_t zone_total_size(void) {
+uint64_t zone_total_size(void)
+{
     zone_t *zone = NULL;
     unsigned int i;
     ipl_t ipl;
     uint64_t total = 0;
     interrupts_restore(ipl);
     return total;
+}
-/** Prints list of zones
+/** Prints list of zones. */
- *
- */
-void zone_print_list(void) {
+void zone_print_list(void)
+{
     zone_t *zone = NULL;
     unsigned int i;
     ipl_t ipl;
-    ipl = interrupts_disable();
-    spinlock_lock(&zones.lock);
 #ifdef __32_BITS__
     printf("#  base address free frames  busy frames\n");
     printf("-- ------------ ------------ ------------\n");
 #endif
 #ifdef __64_BITS__
     printf("#  base address         free frames  busy frames\n");
     printf("-- -------------------- ------------ ------------\n");
 #endif
+    /*
+     * Because printing may require allocation of memory, we may not hold
+     * the frame allocator locks when printing zone statistics.  Therefore,
+     * we simply gather the statistics under the protection of the locks and
+     * print the statistics when the locks have been released.
+     *
+     * When someone adds/removes zones while we are printing the statistics,
+     * we may end up with inaccurate output (e.g. a zone being skipped from
+     * the listing).
+     */
-    for (i = 0; i < zones.count; i++) {
+    for (i = 0; ; i++) {
+        uintptr_t base;
+        count_t free_count;
+        count_t busy_count;
+        ipl = interrupts_disable();
+        spinlock_lock(&zones.lock);
+        if (i >= zones.count) {
+            spinlock_unlock(&zones.lock);
+            interrupts_restore(ipl);
+            break;
+        }
         zone = zones.info[i];
         spinlock_lock(&zone->lock);
+        base = PFN2ADDR(zone->base);
+        free_count = zone->free_count;
+        busy_count = zone->busy_count;
+        spinlock_unlock(&zone->lock);
+        spinlock_unlock(&zones.lock);
+        interrupts_restore(ipl);
 #ifdef __32_BITS__
-        printf("%-2u   %10p %12" PRIc " %12" PRIc "\n", i, PFN2ADDR(zone->base),
+        printf("%-2u   %10p %12" PRIc " %12" PRIc "\n", i, base,
-            zone->free_count, zone->busy_count);
+            free_count, busy_count);
 #endif
 #ifdef __64_BITS__
-        printf("%-2u   %18p %12" PRIc " %12" PRIc "\n", i, PFN2ADDR(zone->base),
+        printf("%-2u   %18p %12" PRIc " %12" PRIc "\n", i, base,
-            zone->free_count, zone->busy_count);
+            free_count, busy_count);
 #endif
-        spinlock_unlock(&zone->lock);
+    }
-    spinlock_unlock(&zones.lock);
-    interrupts_restore(ipl);
+}
 /** Prints zone details.
+ *
- * @param num Zone base address or zone number.
+ * @param num       Zone base address or zone number.
  */
-void zone_print_one(unsigned int num) {
+void zone_print_one(unsigned int num)
+{
     zone_t *zone = NULL;
     ipl_t ipl;
     unsigned int i;
+    uintptr_t base;
+    count_t count;
+    count_t busy_count;
+    count_t free_count;
     ipl = interrupts_disable();
     spinlock_lock(&zones.lock);
     for (i = 0; i < zones.count; i++) {
             zone = zones.info[i];
             break;
+        }
+    }
     if (!zone) {
+        spinlock_unlock(&zones.lock);
+        interrupts_restore(ipl);
         printf("Zone not found.\n");
-        goto out;
+        return;
+    }
     spinlock_lock(&zone->lock);
-    printf("Memory zone information\n");
-    printf("Zone base address: %p\n", PFN2ADDR(zone->base));
+    base = PFN2ADDR(zone->base);
-    printf("Zone size: %" PRIc " frames (%" PRIs " KB)\n", zone->count,
-        SIZE2KB(FRAMES2SIZE(zone->count)));
+    count = zone->count;
-    printf("Allocated space: %" PRIc " frames (%" PRIs " KB)\n", zone->busy_count,
-        SIZE2KB(FRAMES2SIZE(zone->busy_count)));
+    busy_count = zone->busy_count;
-    printf("Available space: %" PRIc " frames (%" PRIs " KB)\n", zone->free_count,
-        SIZE2KB(FRAMES2SIZE(zone->free_count)));
+    free_count = zone->free_count;
-    buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
     spinlock_unlock(&zone->lock);
-out:
     spinlock_unlock(&zones.lock);
     interrupts_restore(ipl);
+    printf("Zone base address: %p\n", base);
+    printf("Zone size: %" PRIc " frames (%" PRIs " KiB)\n", count,
+        SIZE2KB(FRAMES2SIZE(count)));
+    printf("Allocated space: %" PRIc " frames (%" PRIs " KiB)\n",
+        busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
+    printf("Available space: %" PRIc " frames (%" PRIs " KiB)\n",
+        free_count, SIZE2KB(FRAMES2SIZE(free_count)));
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/generic/src/mm/frame.c – Rev 3424 → 3425