Changeset 5d2ab23 in mainline

Timestamp:

2006-01-17T20:52:33Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64c44e8

Parents:

77147d6

Message:

Commit of the falloc_bad branch to trunk (719:723).

Files:

• arch/mips32/src/mm/frame.c (modified) (1 diff)
• generic/include/mm/frame.h (modified) (2 diffs)
• generic/src/main/main.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (8 diffs)
• test/mm/falloc1/test.c (modified) (2 diffs)

arch/mips32/src/mm/frame.c

@@ -51 +51 @@
         else
                 zone_create_in_region(KA2PA(KERNEL_LOAD_ADDRESS),
-                                      config.memory_size & ~(FRAME_SIZE-1));
+                                      (config.memory_size & ~(FRAME_SIZE-1)));
 }

generic/include/mm/frame.h

@@ -50 +50 @@
 #define ADDR2FRAME(zone, addr)                  (&((zone)->frames[((addr) - (zone)->base) / FRAME_SIZE]))
 #define FRAME_INDEX(zone, frame)                ((index_t)((frame) - (zone)->frames))
+#define FRAME_INDEX_ABS(zone, frame)            (((index_t)((frame) - (zone)->frames)) + (zone)->base_index)
 #define FRAME_INDEX_VALID(zone, index)          (((index) >= 0) && ((index) < ((zone)->free_count + (zone)->busy_count)))
 #define IS_BUDDY_ORDER_OK(index, order)         ((~(((__native) -1) << (order)) & (index)) == 0)
 #define IS_BUDDY_LEFT_BLOCK(zone, frame)        (((FRAME_INDEX((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
 #define IS_BUDDY_RIGHT_BLOCK(zone, frame)       (((FRAME_INDEX((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
+#define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame)    (((FRAME_INDEX_ABS((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
+#define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)   (((FRAME_INDEX_ABS((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
 #define ZONE_BLACKLIST_SIZE     4
@@ -62 +65 @@
         SPINLOCK_DECLARE(lock); /**< this lock protects everything below */
         __address base;         /**< physical address of the first frame in the frames array */
+        index_t base_index;     /**< frame index offset of the zone base */
         frame_t *frames;        /**< array of frame_t structures in this zone */
         count_t free_count;     /**< number of free frame_t structures */

generic/src/main/main.c

@@ -123 +123 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + config.kernel_size, CONFIG_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + config.kernel_size - CONFIG_STACK_SIZE, CONFIG_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */

generic/src/mm/frame.c

@@ -134 +134 @@
         }
                 
-
         /* Allocate frames from zone buddy system */
         tmp = buddy_system_alloc(zone->buddy_system, order);
@@ -161 +160 @@
                 *status = FRAME_OK;
         }
-        
         return v;
 }
@@ -180 +178 @@
         zone_t *zone = NULL;
         frame_t *frame;
+        int order;
+        
         ASSERT(addr % FRAME_SIZE == 0);
         
@@ -210 +210 @@
         
         frame = ADDR2FRAME(zone, addr);
+        
+        /* remember frame order */
+        order = frame->buddy_order;
 
         ASSERT(frame->refcount);
@@ -218 +221 @@
 
         /* Update zone information. */
-        zone->free_count += (1 << frame->buddy_order);
-        zone->busy_count -= (1 << frame->buddy_order);
+        zone->free_count += (1 << order);
+        zone->busy_count -= (1 << order);
         
         spinlock_unlock(&zone->lock);
@@ -322 +325 @@
         
                 z->base = start;
+                z->base_index = start / FRAME_SIZE;
+                
                 z->flags = flags;
 
@@ -349 +354 @@
                         buddy_system_free(z->buddy_system, &z->frames[i].buddy_link);   
                 }
+                
         }
         return z;
@@ -401 +407 @@
         frame = list_get_instance(block, frame_t, buddy_link);
         zone = (zone_t *) b->data;
-        
-        ASSERT(IS_BUDDY_ORDER_OK(FRAME_INDEX(zone, frame), frame->buddy_order));
-        
-        is_left = IS_BUDDY_LEFT_BLOCK(zone, frame);
-        is_right = IS_BUDDY_RIGHT_BLOCK(zone, frame);
+        ASSERT(IS_BUDDY_ORDER_OK(FRAME_INDEX_ABS(zone, frame), frame->buddy_order));
+        
+        
+        is_left = IS_BUDDY_LEFT_BLOCK_ABS(zone, frame);
+        is_right = IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame);
         
         ASSERT(is_left ^ is_right);

test/mm/falloc1/test.c

@@ -34 +34 @@
 #include <debug.h>
 
-#define MAX_FRAMES 1024
+#define MAX_FRAMES 2048
 #define MAX_ORDER 8
 #define TEST_RUNS 4
@@ -53 +53 @@
                         allocated = 0;
                         for (i=0;i<MAX_FRAMES>>order;i++) {
-                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING,order, &status);
+                                frames[allocated] = frame_alloc(FRAME_NON_BLOCKING, order, &status);
+                                
+                                if (frames[allocated] % (FRAME_SIZE << order) != 0) {
+                                        panic("Test failed. Block at address %X (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                }
+                                
                                 if (status == 0) {
                                         allocated++;