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

 #include <mm/frame.h>
 #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 <mm/slab.h>
 #include <bitops.h>
 #include <macros.h>
 #include <config.h>
-typedef struct {
-    count_t refcount;     /**< Tracking of shared frames */
-    uint8_t buddy_order;  /**< Buddy system block order */
-    link_t buddy_link;    /**< Link to the next free block inside
-                               one order */
-    void *parent;         /**< If allocated by slab, this points there */
-} frame_t;
-typedef struct {
-    pfn_t base;                    /**< Frame_no of the first frame
-                                        in the frames array */
-    count_t count;                 /**< Size of zone */
-    count_t free_count;            /**< Number of free frame_t
-                                        structures */
-    count_t busy_count;            /**< Number of busy frame_t
-                                        structures */
-    zone_flags_t flags;            /**< Type of the zone */
-    frame_t *frames;               /**< Array of frame_t structures
-                                        in this zone */
-    buddy_system_t *buddy_system;  /**< Buddy system for the zone */
-} zone_t;
-/*
- * The zoneinfo.lock must be locked when accessing zoneinfo structure.
- * Some of the attributes in zone_t structures are 'read-only'
- */
-typedef struct {
-    SPINLOCK_DECLARE(lock);
-    count_t count;
-    zone_t info[ZONES_MAX];
-} zones_t;
-static zones_t zones;
+zones_t zones;
 /*
  * Synchronization primitives used to sleep when there is no memory
  * available.
  */
 static inline index_t make_frame_index(zone_t *zone, frame_t *frame)
+{
     return (frame - zone->frames);
+}
-static inline bool zone_flags_available(zone_flags_t flags)
-{
-    return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0);
-}
 /** Initialize frame structure.
+ *
  * @param frame Frame structure to be initialized.
+ *
  */
             break;
+    }
     /* Move other zones up */
     count_t j;
-    for (j = i; j < zones.count; j++)
+    for (j = zones.count; j > i; j--) {
-        zones.info[j + 1] = zones.info[j];
+        zones.info[j] = zones.info[j - 1];
+        zones.info[j].buddy_system->data =
+            (void *) &zones.info[j - 1];
+    }
     zones.count++;
     return i;
+}
         total += zones.info[i].free_count;
     return total;
+}
-/** Find a zone with a given frame.
+/** Find a zone with a given frames.
+ *
  * Assume interrupts are disabled and zones lock is
  * locked.
+ *
  * @param frame Frame number contained in zone.
+ * @param count Number of frames to look for.
  * @param hint  Used as zone hint.
+ *
  * @return Zone index or -1 if not found.
+ *
  */
-static count_t find_zone(pfn_t frame, count_t hint)
+count_t find_zone(pfn_t frame, count_t count, count_t hint)
+{
     if (hint >= zones.count)
         hint = 0;
     count_t i = hint;
     do {
         if ((zones.info[i].base <= frame)
-            && (zones.info[i].base + zones.info[i].count > frame))
+            && (zones.info[i].base + zones.info[i].count >= frame + count))
             return i;
         i++;
         if (i >= zones.count)
             i = 0;
         ADDR2PFN(KA2PA((uintptr_t) old_z1.frames)), old_z1.count);
     return_config_frames(z1,
         ADDR2PFN(KA2PA((uintptr_t) zones.info[z2].frames)),
         zones.info[z2].count);
-    /* Shift existing zones */
+    /* Move zones down */
     count_t i;
-    for (i = z2 + 1; i < zones.count; i++)
+    for (i = z2 + 1; i < zones.count; i++) {
         zones.info[i - 1] = zones.info[i];
+        zones.info[i - 1].buddy_system->data =
+            (void *) &zones.info[i - 1];
+    }
     zones.count--;
 errout:
     spinlock_unlock(&zones.lock);
     interrupts_restore(ipl);
 void frame_set_parent(pfn_t pfn, void *data, count_t hint)
+{
     ipl_t ipl = interrupts_disable();
     spinlock_lock(&zones.lock);
-    count_t znum = find_zone(pfn, hint);
+    count_t znum = find_zone(pfn, 1, hint);
     ASSERT(znum != (count_t) -1);
     zone_get_frame(&zones.info[znum],
         pfn - zones.info[znum].base)->parent = data;
 void *frame_get_parent(pfn_t pfn, count_t hint)
+{
     ipl_t ipl = interrupts_disable();
     spinlock_lock(&zones.lock);
-    count_t znum = find_zone(pfn, hint);
+    count_t znum = find_zone(pfn, 1, hint);
     ASSERT(znum != (count_t) -1);
     void *res = zone_get_frame(&zones.info[znum],
         pfn - zones.info[znum].base)->parent;
     /*
      * First, find host frame zone for addr.
      */
     pfn_t pfn = ADDR2PFN(frame);
-    count_t znum = find_zone(pfn, NULL);
+    count_t znum = find_zone(pfn, 1, NULL);
     ASSERT(znum != (count_t) -1);
     zone_frame_free(&zones.info[znum], pfn - zones.info[znum].base);
     spinlock_lock(&zones.lock);
     /*
      * First, find host frame zone for addr.
      */
-    count_t znum = find_zone(pfn, NULL);
+    count_t znum = find_zone(pfn, 1, NULL);
     ASSERT(znum != (count_t) -1);
     zones.info[znum].frames[pfn - zones.info[znum].base].refcount++;
     ipl_t ipl = interrupts_disable();
     spinlock_lock(&zones.lock);
     count_t i;
     for (i = 0; i < count; i++) {
-        count_t znum = find_zone(start + i, 0);
+        count_t znum = find_zone(start + i, 1, 0);
         if (znum == (count_t) -1)  /* PFN not found */
             continue;
         zone_mark_unavailable(&zones.info[znum],
             start + i - zones.info[znum].base);
 /** Prints list of zones. */
 void zone_print_list(void)
+{
 #ifdef __32_BITS__
-    printf("#  base address flags    free frames  busy frames\n");
+    printf("#  base address frames       flags    free frames  busy frames\n");
-    printf("-- ------------ -------- ------------ ------------\n");
+    printf("-- ------------ ------------ -------- ------------ ------------\n");
 #endif
 #ifdef __64_BITS__
-    printf("#  base address         flags    free frames  busy frames\n");
+    printf("#  base address          frames      flags    free frames  busy frames\n");
-    printf("-- -------------------- -------- ------------ ------------\n");
+    printf("-- -------------------- ------------ -------- ------------ ------------\n");
 #endif
     /*
      * Because printing may require allocation of memory, we may not hold
      * the frame allocator locks when printing zone statistics.  Therefore,
             interrupts_restore(ipl);
             break;
+        }
         uintptr_t base = PFN2ADDR(zones.info[i].base);
+        count_t count = zones.info[i].count;
         zone_flags_t flags = zones.info[i].flags;
         count_t free_count = zones.info[i].free_count;
         count_t busy_count = zones.info[i].busy_count;
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
         bool available = zone_flags_available(flags);
+        printf("%-2" PRIc, i);
 #ifdef __32_BITS__
-        printf("%-2" PRIc "   %10p %c%c%c      ", i, base,
+        printf("   %10p", base);
-            available ? 'A' : ' ',
-            (flags & ZONE_RESERVED) ? 'R' : ' ',
-            (flags & ZONE_FIRMWARE) ? 'F' : ' ');
 #endif
 #ifdef __64_BITS__
+        printf("   %18p", base);
+#endif
-        printf("%-2" PRIc "   %18p %c%c%c      ", i, base,
+        printf(" %12" PRIc " %c%c%c      ", count,
             available ? 'A' : ' ',
             (flags & ZONE_RESERVED) ? 'R' : ' ',
             (flags & ZONE_FIRMWARE) ? 'F' : ' ');
-#endif
         if (available)
             printf("%12" PRIc " %12" PRIc,
                 free_count, busy_count);
         printf("\n");
+    }
+}
 /** Prints zone details.

Subversion Repositories HelenOS

(root)/trunk/kernel/generic/src/mm/frame.c – Rev 3972 → 3973