Changes in / [7da90cd:c7bbf029] in mainline

Location:

kernel/generic/src/mm

Files:

• frame.c (modified) (2 diffs)
• reserve.c (modified) (5 diffs)

kernel/generic/src/mm/frame.c

@@ -481 +481 @@
         
         frame_t *frame = &zone->frames[frame_idx];
-        size_t size = 0;
+        size_t size = 1 << 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;
@@ -1007 +1007 @@
          * If not told otherwise, we must first reserve the memory.
          */
-        if (!(flags & FRAME_NO_RESERVE)) 
-                reserve_force_alloc(size);
-
+        if (!(flags & FRAME_NO_RESERVE)) {
+                if (flags & FRAME_ATOMIC) {
+                        if (!reserve_try_alloc(size))
+                                return NULL;
+                } else {
+                        reserve_force_alloc(size);
+                }
+        }
+        
 loop:
         irq_spinlock_lock(&zones.lock, true);

kernel/generic/src/mm/reserve.c

@@ -38 +38 @@
 #include <mm/reserve.h>
 #include <mm/frame.h>
-#include <mm/slab.h>
 #include <synch/spinlock.h>
 #include <typedefs.h>
@@ -46 +45 @@
 static ssize_t reserve = 0;
 
-/** Try to reserve memory.
- *
- * This function may not be called from contexts that do not allow memory
- * reclaiming, such as some invocations of frame_alloc_generic().
- *
- * @param size          Number of frames to reserve.
- * @return              True on success or false otherwise.
- */
 bool reserve_try_alloc(size_t size)
 {
@@ -62 +53 @@
                 reserve -= size;
                 reserved = true;
-        } else {
-                /*
-                 * Some reservable frames may be cached by the slab allocator.
-                 * Try to reclaim some reservable memory. Try to be gentle for
-                 * the first time. If it does not help, try to reclaim
-                 * everything.
-                 */
-                irq_spinlock_unlock(&reserve_lock, true);
-                slab_reclaim(0);
-                irq_spinlock_lock(&reserve_lock, true);
-                if (reserve >= 0 && (size_t) reserve >= size) {
-                        reserve -= size;
-                        reserved = true;
-                } else {
-                        irq_spinlock_unlock(&reserve_lock, true);
-                        slab_reclaim(SLAB_RECLAIM_ALL);
-                        irq_spinlock_lock(&reserve_lock, true);
-                        if (reserve >= 0 && (size_t) reserve >= size) {
-                                reserve -= size;
-                                reserved = true;
-                        }
-                }
         }
         irq_spinlock_unlock(&reserve_lock, true);
@@ -90 +59 @@
 }
 
-/** Reserve memory.
- *
- * This function simply marks the respective amount of memory frames reserved.
- * It does not implement any sort of blocking for the case there is not enough
- * reservable memory. It will simply take the reserve into negative numbers and
- * leave the blocking up to the allocation phase.
- *
- * @param size          Number of frames to reserve.
- */
 void reserve_force_alloc(size_t size)
 {
@@ -106 +66 @@
 }
 
-/** Unreserve memory.
- *
- * @param size          Number of frames to unreserve.
- */
 void reserve_free(size_t size)
 {