Changeset 65f3117 in mainline

Timestamp:

2023-02-25T13:16:38Z (21 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

6188fee

Parents:

4f84ee42

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-14 13:38:14)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-25 13:16:38)

Message:

Make bootstrap stack statically, rather than dynamically allocated

With aligment requirements being part of the language now, it is
simple to allocate the extra stack area in kernel data, and we
don't need to go to so much trouble with manual allocation.
It also makes it slightly more straightforward to use the stack
from assembly, without having to dig through a saved context
structure.

Location:

kernel

Files:

• arch/amd64/src/smp/ap.S (modified) (1 diff)
• arch/ia32/src/smp/ap.S (modified) (1 diff)
• arch/mips32/src/mm/frame.c (modified) (1 diff)
• arch/sparc64/src/sun4u/start.S (modified) (1 diff)
• generic/include/config.h (modified) (1 diff)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/mm/frame.c (modified) (2 diffs)

kernel/arch/amd64/src/smp/ap.S

@@ -98 +98 @@
 .code64
 start64:
-        movabsq $ctx, %rsp
-        movq CONTEXT_OFFSET_SP(%rsp), %rsp
+        movabsq $bootstrap_stack_top, %rsp
+        movq (%rsp), %rsp
 
+        pushq $0
         pushq $0
         movq %rsp, %rbp

kernel/arch/ia32/src/smp/ap.S

@@ -75 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
-        movl CONTEXT_OFFSET_SP(%eax), %esp
+        movl $KA2PA(bootstrap_stack_top), %eax   /* KA2PA((uintptr_t) &bootstrap_stack_top) */
+        movl (%eax), %esp
         leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 

kernel/arch/mips32/src/mm/frame.c

@@ -111 +111 @@
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
             KA2PA(config.base), config.kernel_size))
-                return false;
-
-        /* Kernel stack */
-        if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-            KA2PA(config.stack_base), config.stack_size))
                 return false;
 

kernel/arch/sparc64/src/sun4u/start.S

@@ -356 +356 @@
          * in the ctx global variable.
          */
-        set ctx, %g1
-        add %g1, CONTEXT_OFFSET_SP, %g1
+        set bootstrap_stack_top, %g1
         ldx [%g1], %o6
 

kernel/generic/include/config.h

@@ -87 +87 @@
         size_t kernel_size;
 
-        /** Base adddress of initial stack. */
-        uintptr_t stack_base;
-        /** Size of initial stack. */
-        size_t stack_size;
-
         bool identity_configured;
         /** Base address of the kernel identity mapped memory. */

kernel/generic/src/main/main.c

@@ -137 +137 @@
 uintptr_t stack_safe = 0;
 
+// NOTE: All kernel stacks must be aligned to STACK_SIZE, see CURRENT.
+const size_t bootstrap_stack_size = STACK_SIZE;
+_Alignas(STACK_SIZE) uint8_t bootstrap_stack[STACK_SIZE];
+/* Just a convenient value for some assembly code. */
+const uint8_t *bootstrap_stack_top = bootstrap_stack + STACK_SIZE;
+
 /*
  * These two functions prevent stack from underflowing during the
@@ -170 +176 @@
             ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 
-        /*
-         * NOTE: All kernel stacks must be aligned to STACK_SIZE,
-         *       see CURRENT.
-         */
-
-        /* Place the stack after the kernel, init and ballocs. */
-        config.stack_base =
-            ALIGN_UP(config.base + config.kernel_size, STACK_SIZE);
-        config.stack_size = STACK_SIZE;
-
-        /* Avoid placing stack on top of init */
-        size_t i;
-        for (i = 0; i < init.cnt; i++) {
-                uintptr_t p = init.tasks[i].paddr + init.tasks[i].size;
-                uintptr_t bottom = PA2KA(ALIGN_UP(p, STACK_SIZE));
-
-                if (config.stack_base < bottom)
-                        config.stack_base = bottom;
-        }
-
-        /* Avoid placing stack on top of boot allocations. */
-        if (ballocs.size) {
-                uintptr_t bottom =
-                    ALIGN_UP(ballocs.base + ballocs.size, STACK_SIZE);
-                if (config.stack_base < bottom)
-                        config.stack_base = bottom;
-        }
-
-        if (config.stack_base < stack_safe)
-                config.stack_base = ALIGN_UP(stack_safe, STACK_SIZE);
-
         context_save(&ctx);
         context_set(&ctx, FADDR(main_bsp_separated_stack),
-            config.stack_base, STACK_SIZE);
+            bootstrap_stack, bootstrap_stack_size);
         context_restore(&ctx);
         /* not reached */

kernel/generic/src/mm/frame.c

@@ -752 +752 @@
                                         continue;
 
-                                if (overlaps(addr, PFN2ADDR(confcount),
-                                    KA2PA(config.stack_base), config.stack_size))
-                                        continue;
-
                                 bool overlap = false;
                                 for (size_t i = 0; i < init.cnt; i++) {
@@ -1121 +1117 @@
                 frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
                     SIZE2FRAMES(config.kernel_size));
-                frame_mark_unavailable(ADDR2PFN(KA2PA(config.stack_base)),
-                    SIZE2FRAMES(config.stack_size));
 
                 for (size_t i = 0; i < init.cnt; i++)