Changes in kernel/generic/src/mm/frame.c [864b0dd:7e752b2] in mainline

File:

• kernel/generic/src/mm/frame.c (modified) (14 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>
@@ -473 +472 @@
  * @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);
+        }
 }
 
@@ -519 +516 @@
         ASSERT(link);
         zone->free_count--;
-        reserve_force_alloc(1);
 }
 
@@ -649 +645 @@
         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);
         }
@@ -687 +683 @@
         /* 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);
 }
 
@@ -699 +695 @@
  * 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
  *
  */
@@ -839 +837 @@
                         buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
                 }
-
-                /* "Unreserve" new frames. */
-                reserve_free(count);
         } else
                 zone->frames = NULL;
@@ -1004 +999 @@
         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);
@@ -1044 +1033 @@
                 if (flags & FRAME_ATOMIC) {
                         irq_spinlock_unlock(&zones.lock, true);
-                        if (!(flags & FRAME_NO_RESERVE))
-                                reserve_free(size);
                         return NULL;
                 }
@@ -1101 +1088 @@
 }
 
-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.
  *
@@ -1118 +1095 @@
  *
  * @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 +1106 @@
         pfn_t pfn = ADDR2PFN(frame);
         size_t znum = find_zone(pfn, 1, 0);
-
         
         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);
@@ -1145 +1118 @@
         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) {
@@ -1152 +1125 @@
         }
         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);
 }