Changeset f275cb3 in mainline

Timestamp:

2006-01-08T16:35:41Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

b2c92f33

Parents:

677a6d5

Message:

Frame alloc test #1

Files:

• arch/mips32/src/mm/page.c (modified) (1 diff)
• genarch/src/mm/page_pt.c (modified) (3 diffs)
• generic/include/mm/frame.h (modified) (2 diffs)
• generic/src/cpu/cpu.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (4 diffs)
• generic/src/mm/vm.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (1 diff)
• kernel.config (modified) (1 diff)
• test/mm/falloc1/test.c (added)
• test/mm/mapping1/test.c (modified) (1 diff)

arch/mips32/src/mm/page.c

@@ -43 +43 @@
         page_operations = &page_pt_operations;
         
-        ptl0 = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
+        ptl0 = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL);
         memsetb(ptl0, FRAME_SIZE, 0);
         

genarch/src/mm/page_pt.c

@@ -64 +64 @@
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
@@ -73 +73 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
@@ -82 +82 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA, ONE_FRAME);
+                newpt = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
                 memsetb(newpt, PAGE_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));

generic/include/mm/frame.h

@@ -39 +39 @@
 #define ONE_FRAME       0
 
-#define FRAME_KA        1       /* skip frames conflicting with user address space */
-#define FRAME_PANIC     2       /* panic on failure */
+#define FRAME_KA                1       /* skip frames conflicting with user address space */
+#define FRAME_PANIC             2       /* panic on failure */
+#define FRAME_NON_BLOCKING      4       /* do not panic and do not sleep on failure */
+
+#define FRAME_OK                0       /* frame_alloc return status */
+#define FRAME_NO_MEMORY         1       /* frame_alloc return status */
+#define FRAME_ERROR             2       /* frame_alloc return status */
 
 #define FRAME2ADDR(zone, frame)                 ((zone)->base + ((frame) - (zone)->frames) * FRAME_SIZE)
@@ -89 +94 @@
 extern void frame_init(void);
 extern void frame_initialize(frame_t *frame, zone_t *zone);
-__address frame_alloc(int flags, __u8 order);
+
+__address frame_alloc(int flags, __u8 order, int * status);
 extern void frame_free(__address addr);
+
 zone_t * get_zone_by_frame(frame_t * frame);
 

generic/src/cpu/cpu.c

@@ -62 +62 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
+                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL);
                         
                         cpus[i].id = i;

generic/src/mm/frame.c

@@ -84 +84 @@
  * @return Allocated frame.
  */
-__address frame_alloc(int flags, __u8 order) 
+__address frame_alloc(int flags, __u8 order, int * status) 
 {
         ipl_t ipl;
@@ -118 +118 @@
                         panic("Can't allocate frame.\n");
                 
+                
+                
                 /*
                  * TODO: Sleep until frames are available again.
@@ -124 +126 @@
                 interrupts_restore(ipl);
 
+                if (flags & FRAME_NON_BLOCKING) {
+                        ASSERT(status != NULL);
+                        *status = FRAME_NO_MEMORY;
+                        return NULL;
+                }
+                
                 panic("Sleep not implemented.\n");
                 goto loop;
@@ -151 +159 @@
         if (flags & FRAME_KA)
                 v = PA2KA(v);
+        
+        if (flags & FRAME_NON_BLOCKING) {
+                ASSERT(status != NULL);
+                *status = FRAME_OK;
+        }
         
         return v;

generic/src/mm/vm.c

@@ -71 +71 @@
                 
                         src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
-                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
+                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL);
 
 //                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
@@ -117 +117 @@
                 
                 for (i=0; i<size; i++)
-                        a->mapping[i] = frame_alloc(0, ONE_FRAME);
+                        a->mapping[i] = frame_alloc(0, ONE_FRAME, NULL);
                 
                 spinlock_initialize(&a->lock, "vm_area_lock");

generic/src/proc/thread.c

@@ -174 +174 @@
                 spinlock_initialize(&t->lock, "thread_t_lock");
         
-                frame_ks = frame_alloc(FRAME_KA, ONE_FRAME);
+                frame_ks = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
                 if (THREAD_USER_STACK & flags) {
-                        frame_us = frame_alloc(FRAME_KA, ONE_FRAME);
+                        frame_us = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
                 }
 

kernel.config

@@ -82 +82 @@
 @ "thread/thread1" Thread test 1
 @ "mm/mapping1" Mapping test 1
+@ "mm/falloc1" Frame Allocation test 1
 @ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
 ! CONFIG_TEST (choice)

test/mm/mapping1/test.c

@@ -48 +48 @@
         printf("Memory management test mapping #1\n");
 
-        frame0 = frame_alloc(FRAME_KA, ONE_FRAME);
-        frame1 = frame_alloc(FRAME_KA, ONE_FRAME);      
+        frame0 = frame_alloc(FRAME_KA, ONE_FRAME, NULL);
+        frame1 = frame_alloc(FRAME_KA, ONE_FRAME, NULL);        
 
         printf("Writing %L to physical address %P.\n", VALUE0, KA2PA(frame0));