Changeset 1093620 in mainline

Timestamp:

2006-01-22T16:51:11Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

0d8d27c

Parents:

bd6e392

Message:

Fixes, comments, tests to frame allocator

Files:

• generic/include/mm/buddy.h (modified) (1 diff)
• generic/src/mm/buddy.c (modified) (7 diffs)
• generic/src/mm/frame.c (modified) (1 diff)
• test/mm/falloc1/test.c (modified) (3 diffs)
• test/mm/falloc2/test.c (modified) (6 diffs)

generic/include/mm/buddy.h

@@ -46 +46 @@
 
 struct buddy_system {
-        __u8 max_order;
+        __u8 max_order;                         /**< Maximal order of block which can be stored by buddy system. */
         link_t *order;
         buddy_system_operations_t *op;

generic/src/mm/buddy.c

@@ -69 +69 @@
                  * Allocate memory for all orders this buddy system will work with.
                  */
-                b->order = (link_t *) early_malloc(max_order * sizeof(link_t));
+                b->order = (link_t *) early_malloc((max_order + 1) * sizeof(link_t));
                 if (!b->order) {
                         early_free(b);
@@ -75 +75 @@
                 }
         
-                for (i = 0; i < max_order; i++)
+                for (i = 0; i <= max_order; i++)
                         list_initialize(&b->order[i]);
         
@@ -96 +96 @@
         __u8 k;
         
-        ASSERT(i < b->max_order);
-        
-        for (k=i; k < b->max_order; k++) {
+        /*
+         * If requested block is greater then maximal block
+         * we know immediatly that we cannot satisfy the request.
+         */
+        if (i > b->max_order) return false;
+
+        /*
+         * Check if any bigger or equal order has free elements
+         */
+        for (k=i; k <= b->max_order; k++) {
                 if (!list_empty(&b->order[k])) {
                         return true;
@@ -119 +126 @@
         link_t *res, *hlp;
 
-        ASSERT(i < b->max_order);
+        ASSERT(i <= b->max_order);
 
         /*
@@ -136 +143 @@
          * the request cannot be satisfied.
          */
-        if (i == b->max_order - 1)
+        if (i == b->max_order)
                 return NULL;
 
@@ -186 +193 @@
         i = b->op->get_order(b, block);
 
-        ASSERT(i < b->max_order);
-
-        if (i != b->max_order - 1) {
+        ASSERT(i <= b->max_order);
+
+        if (i != b->max_order) {
                 /*
                  * See if there is any buddy in the list of order i.
@@ -246 +253 @@
         printf("-----\t------\t--------\t----------\t---------------\n");
         
-        for (i=0;i < b->max_order; i++) {
+        for (i=0;i <= b->max_order; i++) {
                 cnt = 0;
                 if (!list_empty(&b->order[i])) {

generic/src/mm/frame.c

@@ -153 +153 @@
         interrupts_restore(ipl);
 
+        ASSERT(v == ALIGN_UP(v, FRAME_SIZE << order));
+
         if (flags & FRAME_KA)
                 v = PA2KA(v);

test/mm/falloc1/test.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/heap.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
 #include <debug.h>
 
-#define MAX_FRAMES 2048
+#define MAX_FRAMES 1024
 #define MAX_ORDER 8
-#define TEST_RUNS 4
+#define TEST_RUNS 2
 
 void test(void) {
-        __address frames[MAX_FRAMES];
+        __address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address));
         int results[MAX_ORDER+1];
         
@@ -53 +54 @@
                         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 | FRAME_KA, order, &status);
                                 
                                 if (frames[allocated] % (FRAME_SIZE << order) != 0) {
@@ -83 +84 @@
         }
 
-
+        free(frames);
         
         printf("Test passed\n");

test/mm/falloc2/test.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/heap.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -37 +38 @@
 #include <memstr.h>
 
-#define MAX_FRAMES 128
-#define MAX_ORDER 2
+#define MAX_FRAMES 256
+#define MAX_ORDER 8
 
 #define THREAD_RUNS 1
-#define THREADS 6
+#define THREADS 8
 
 static void thread(void * arg);
@@ -54 +55 @@
         index_t k;
         
-        __address frames[MAX_FRAMES];
+        __address * frames =  (__address *) malloc(MAX_FRAMES * sizeof(__address));
 
         for (run=0;run<THREAD_RUNS;run++) {
@@ -61 +62 @@
                         printf("Thread #%d: Allocating %d frames blocks ... \n",val, 1<<order);
                         allocated = 0;
-                        for (i=0;i<MAX_FRAMES>>order;i++) {
+                        for (i=0;i < (MAX_FRAMES >> order);i++) {
                                 frames[allocated] = frame_alloc(FRAME_NON_BLOCKING | FRAME_KA,order, &status);
                                 if (status == 0) {
@@ -75 +76 @@
                         printf("Thread #%d: Deallocating ... \n", val);
                         for (i=0;i<allocated;i++) {
+                        
                                 for (k=0;k<=((FRAME_SIZE << order) - 1);k++) {
                                         if ( ((char *) frames[i])[k] != val ) {
@@ -82 +84 @@
                                 
                                 }
-                        
+                                
                                 frame_free(frames[i]);
                         }