Changeset deaa22f in mainline

Timestamp:

2006-08-02T00:42:30Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf78569

Parents:

adf7f9c

Message:

more sophisticated initial stack handling

Location:

kernel

Files:

• arch/amd64/src/mm/page.c (modified) (1 diff)
• arch/xen32/src/xen32.c (modified) (1 diff)
• generic/include/config.h (modified) (1 diff)
• generic/include/main/main.h (added)
• generic/src/main/main.c (modified) (4 diffs)
• generic/src/mm/frame.c (modified) (2 diffs)

kernel/arch/amd64/src/mm/page.c

@@ -100 +100 @@
                  *   because some are needed for init )
                  */
-                for (cur = PA2KA_CODE(0); cur < config.base+config.kernel_size; cur += FRAME_SIZE) {
+                for (cur = PA2KA_CODE(0); cur < config.base + config.kernel_size; cur += FRAME_SIZE)
                         page_mapping_insert(AS_KERNEL, cur, KA2PA(cur), identity_flags);
-                }
-                for (i=0; i < init.cnt; i++) {
-                        for (cur=init.tasks[i].addr;cur < init.tasks[i].size; cur += FRAME_SIZE) {
+                
+                for (cur = config.stack_base; cur < config.stack_base + config.stack_size; cur += FRAME_SIZE)
+                        page_mapping_insert(AS_KERNEL, cur, KA2PA(cur), identity_flags);
+                
+                for (i = 0; i < init.cnt; i++) {
+                        for (cur = init.tasks[i].addr; cur < init.tasks[i].addr + init.tasks[i].size; cur += FRAME_SIZE)
                                 page_mapping_insert(AS_KERNEL, PA2KA_CODE(KA2PA(cur)), KA2PA(cur), identity_flags);
-                        }
                 }
 

kernel/arch/xen32/src/xen32.c

@@ -34 +34 @@
 
 #include <arch.h>
+#include <main/main.h>
 
 #include <arch/types.h>

kernel/generic/include/config.h

@@ -63 +63 @@
         size_t memory_size;             /**< Size of detected memory in bytes. */
         size_t kernel_size;             /**< Size of memory in bytes taken by kernel and stack */
+        
+        uintptr_t stack_base;   /**< Base adddress of initial stack */
+        size_t stack_size;              /**< Size of initial stack */
 } config_t;
 

kernel/generic/src/main/main.c

@@ -106 +106 @@
 size_t hardcoded_kdata_size = 0;        /**< Size of the kernel data in bytes. */
 
+uintptr_t stack_safe = 0;       /**< Lowest safe stack virtual address */
+
 void main_bsp(void);
 void main_ap(void);
@@ -133 +135 @@
 void main_bsp(void)
 {
-        uintptr_t stackaddr;
-
         config.cpu_count = 1;
         config.cpu_active = 1;
@@ -142 +142 @@
         
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size, PAGE_SIZE);
-        stackaddr = config.base + config.kernel_size;
-        
-        /* Avoid placing kernel on top of init */
+        config.stack_size = CONFIG_STACK_SIZE;
+        
+        /* Initialy the stack is placed just after the kernel */
+        config.stack_base = config.base + config.kernel_size;
+        
+        /* Avoid placing stack on top of init */
         count_t i;
-        bool overlap = false;
-        for (i = 0; i < init.cnt; i++)
-                if (PA_overlaps(stackaddr, CONFIG_STACK_SIZE, init.tasks[i].addr, init.tasks[i].size)) {
-                        stackaddr = ALIGN_UP(init.tasks[i].addr + init.tasks[i].size, CONFIG_STACK_SIZE);
-                        init.tasks[i].size = ALIGN_UP(init.tasks[i].size, CONFIG_STACK_SIZE) + CONFIG_STACK_SIZE;
-                        overlap = true;
-                }
-        
-        if (!overlap)
-                config.kernel_size += CONFIG_STACK_SIZE;
+        for (i = 0; i < init.cnt; i++) {
+                if (PA_overlaps(config.stack_base, config.stack_size, init.tasks[i].addr, init.tasks[i].size))
+                        config.stack_base = ALIGN_UP(init.tasks[i].addr + init.tasks[i].size, config.stack_size);
+        }
+        
+        if (config.stack_base < stack_safe)
+                config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE);
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), stackaddr, THREAD_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base, THREAD_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -203 +203 @@
 
         version_print();
-        printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
+        printf("kernel: %.*p hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
+        printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2, config.stack_base, config.stack_size >> 10);
 
         arch_pre_smp_init();

kernel/generic/src/mm/frame.c

@@ -864 +864 @@
                         addr = PFN2ADDR(confframe);
                         if (overlaps(addr, PFN2ADDR(confcount), KA2PA(config.base), config.kernel_size))
+                                continue;
+                        
+                        if (overlaps(addr, PFN2ADDR(confcount), KA2PA(config.stack_base), config.stack_size))
                                 continue;
                         
@@ -1069 +1072 @@
         frame_arch_init();
         if (config.cpu_active == 1) {
-                pfn_t firstframe = ADDR2PFN(KA2PA(config.base));
-                pfn_t lastframe = ADDR2PFN(KA2PA(config.base+config.kernel_size));
-                frame_mark_unavailable(firstframe,lastframe-firstframe+1);
+                frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)), SIZE2FRAMES(config.kernel_size));
+                frame_mark_unavailable(ADDR2PFN(KA2PA(config.stack_base)), SIZE2FRAMES(config.stack_size));
                 
                 count_t i;