Changes in kernel/generic/src/mm/frame.c [933cadf:af96dd57] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -45 +45 @@
 #include <typedefs.h>
 #include <mm/frame.h>
-#include <mm/reserve.h>
 #include <mm/as.h>
 #include <panic.h>
@@ -60 +59 @@
 #include <macros.h>
 #include <config.h>
-#include <str.h>
 
 zones_t zones;
@@ -147 +145 @@
                             (!iswithin(zones.info[i].base, zones.info[i].count,
                             base, count))) {
-                                printf("Zone (%p, %p) overlaps "
-                                    "with previous zone (%p %p)!\n",
-                                    (void *) PFN2ADDR(base), (void *) PFN2ADDR(count),
-                                    (void *) PFN2ADDR(zones.info[i].base),
-                                    (void *) PFN2ADDR(zones.info[i].count));
+                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
+                                    PFN2ADDR(base), PFN2ADDR(count),
+                                    PFN2ADDR(zones.info[i].base),
+                                    PFN2ADDR(zones.info[i].count));
                         }
                         
@@ -474 +471 @@
  * @param frame_idx Frame index relative to zone.
  *
- * @return          Number of freed frames.
- *
- */
-NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t frame_idx)
+ */
+NO_TRACE static void zone_frame_free(zone_t *zone, size_t frame_idx)
 {
         ASSERT(zone_flags_available(zone->flags));
         
         frame_t *frame = &zone->frames[frame_idx];
-        size_t size = 0;
+        
+        /* Remember frame order */
+        uint8_t order = frame->buddy_order;
         
         ASSERT(frame->refcount);
         
         if (!--frame->refcount) {
-                size = 1 << frame->buddy_order;
-                buddy_system_free(zone->buddy_system, &frame->buddy_link);              
+                buddy_system_free(zone->buddy_system, &frame->buddy_link);
+                
                 /* Update zone information. */
-                zone->free_count += size;
-                zone->busy_count -= size;
-        }
-        
-        return size;
+                zone->free_count += (1 << order);
+                zone->busy_count -= (1 << order);
+        }
 }
 
@@ -520 +515 @@
         ASSERT(link);
         zone->free_count--;
-        reserve_force_alloc(1);
 }
 
@@ -650 +644 @@
         for (i = 0; i < cframes; i++) {
                 zones.info[znum].busy_count++;
-                (void) zone_frame_free(&zones.info[znum],
+                zone_frame_free(&zones.info[znum],
                     pfn - zones.info[znum].base + i);
         }
@@ -688 +682 @@
         /* Free unneeded frames */
         for (i = count; i < (size_t) (1 << order); i++)
-                (void) zone_frame_free(&zones.info[znum], i + frame_idx);
+                zone_frame_free(&zones.info[znum], i + frame_idx);
 }
 
@@ -700 +694 @@
  * not to be 2^order size. Once the allocator is running it is no longer
  * possible, merged configuration data occupies more space :-/
+ *
+ * The function uses
  *
  */
@@ -840 +836 @@
                         buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
                 }
-
-                /* "Unreserve" new frames. */
-                reserve_free(count);
         } else
                 zone->frames = NULL;
@@ -885 +878 @@
                  * the assert
                  */
-                ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL));
+                ASSERT(confframe != NULL);
                 
                 /* If confframe is supposed to be inside our zone, then make sure
@@ -1005 +998 @@
         size_t hint = pzone ? (*pzone) : 0;
         
-        /*
-         * If not told otherwise, we must first reserve the memory.
-         */
-        if (!(flags & FRAME_NO_RESERVE)) 
-                reserve_force_alloc(size);
-
 loop:
         irq_spinlock_lock(&zones.lock, true);
@@ -1045 +1032 @@
                 if (flags & FRAME_ATOMIC) {
                         irq_spinlock_unlock(&zones.lock, true);
-                        if (!(flags & FRAME_NO_RESERVE))
-                                reserve_free(size);
                         return NULL;
                 }
@@ -1064 +1049 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %zu frames, "
-                    "%zu available.\n", THREAD->tid, size, avail);
+                printf("Thread %" PRIu64 " waiting for %" PRIs " frames, "
+                    "%" PRIs " available.\n", THREAD->tid, size, avail);
 #endif
                 
@@ -1102 +1087 @@
 }
 
-void *frame_alloc(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags, NULL);
-}
-
-void *frame_alloc_noreserve(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, NULL);
-}
-
 /** Free a frame.
  *
@@ -1119 +1094 @@
  *
  * @param frame Physical Address of of the frame to be freed.
- * @param flags Flags to control memory reservation.
- *
- */
-void frame_free_generic(uintptr_t frame, frame_flags_t flags)
-{
-        size_t size;
-        
+ *
+ */
+void frame_free(uintptr_t frame)
+{
         irq_spinlock_lock(&zones.lock, true);
         
@@ -1132 +1104 @@
          */
         pfn_t pfn = ADDR2PFN(frame);
-        size_t znum = find_zone(pfn, 1, 0);
-
+        size_t znum = find_zone(pfn, 1, NULL);
         
         ASSERT(znum != (size_t) -1);
         
-        size = zone_frame_free(&zones.info[znum], pfn - zones.info[znum].base);
+        zone_frame_free(&zones.info[znum], pfn - zones.info[znum].base);
         
         irq_spinlock_unlock(&zones.lock, true);
@@ -1146 +1117 @@
         mutex_lock(&mem_avail_mtx);
         if (mem_avail_req > 0)
-                mem_avail_req -= min(mem_avail_req, size);
+                mem_avail_req--;
         
         if (mem_avail_req == 0) {
@@ -1153 +1124 @@
         }
         mutex_unlock(&mem_avail_mtx);
-        
-        if (!(flags & FRAME_NO_RESERVE))
-                reserve_free(size);
-}
-
-void frame_free(uintptr_t frame)
-{
-        frame_free_generic(frame, 0);
-}
-
-void frame_free_noreserve(uintptr_t frame)
-{
-        frame_free_generic(frame, FRAME_NO_RESERVE);
 }
 
@@ -1183 +1141 @@
          * First, find host frame zone for addr.
          */
-        size_t znum = find_zone(pfn, 1, 0);
+        size_t znum = find_zone(pfn, 1, NULL);
         
         ASSERT(znum != (size_t) -1);
@@ -1339 +1297 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-4zu", i);
+                printf("%-4" PRIs, i);
                 
 #ifdef __32_BITS__
-                printf("  %p", (void *) base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf(" %p", (void *) base);
+                printf(" %18p", base);
 #endif
                 
-                printf(" %12zu %c%c%c      ", count,
+                printf(" %12" PRIs " %c%c%c      ", count,
                     available ? 'A' : ' ',
                     (flags & ZONE_RESERVED) ? 'R' : ' ',
@@ -1355 +1313 @@
                 
                 if (available)
-                        printf("%14zu %14zu",
+                        printf("%14" PRIs " %14" PRIs,
                             free_count, busy_count);
                 
@@ -1396 +1354 @@
         bool available = zone_flags_available(flags);
         
-        uint64_t size;
-        const char *size_suffix;
-        bin_order_suffix(FRAMES2SIZE(count), &size, &size_suffix, false);
-        
-        printf("Zone number:       %zu\n", znum);
-        printf("Zone base address: %p\n", (void *) base);
-        printf("Zone size:         %zu frames (%" PRIu64 " %s)\n", count,
-            size, size_suffix);
+        printf("Zone number:       %" PRIs "\n", znum);
+        printf("Zone base address: %p\n", base);
+        printf("Zone size:         %" PRIs " frames (%" PRIs " KiB)\n", count,
+            SIZE2KB(FRAMES2SIZE(count)));
         printf("Zone flags:        %c%c%c\n",
             available ? 'A' : ' ',
@@ -1410 +1364 @@
         
         if (available) {
-                bin_order_suffix(FRAMES2SIZE(busy_count), &size, &size_suffix,
-                    false);
-                printf("Allocated space:   %zu frames (%" PRIu64 " %s)\n",
-                    busy_count, size, size_suffix);
-                bin_order_suffix(FRAMES2SIZE(free_count), &size, &size_suffix,
-                    false);
-                printf("Available space:   %zu frames (%" PRIu64 " %s)\n",
-                    free_count, size, size_suffix);
+                printf("Allocated space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                    busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
+                printf("Available space:   %" PRIs " frames (%" PRIs " KiB)\n",
+                    free_count, SIZE2KB(FRAMES2SIZE(free_count)));
         }
 }