Changeset d1da1ff2 in mainline

Timestamp:

2018-11-01T22:20:13Z (6 years ago)

Author:

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

Branches:

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

Children:

2e4343b

Parents:

a6e55886

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-01 16:25:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-01 22:20:13)

Message:

Fix kernel stack allocation

Location:

kernel/generic/src

Files:

• cpu/cpu.c (modified) (1 diff)
• main/main.c (modified) (4 diffs)
• proc/thread.c (modified) (1 diff)

kernel/generic/src/cpu/cpu.c

@@ -72 +72 @@
                 memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0);
 
+                // XXX: All kernel stacks must be aligned to STACK_SIZE,
+                //      see get_current().
                 size_t i;
                 for (i = 0; i < config.cpu_count; i++) {

kernel/generic/src/main/main.c

@@ -173 +173 @@
             ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 
+        // XXX: All kernel stacks must be aligned to STACK_SIZE,
+        //      see get_current().
+
         /* Place the stack after the kernel, init and ballocs. */
-        config.stack_base = config.base + config.kernel_size;
+        config.stack_base =
+            ALIGN_UP(config.base + config.kernel_size, STACK_SIZE);
         config.stack_size = STACK_SIZE;
 
@@ -181 +185 @@
         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, PAGE_SIZE));
+                uintptr_t bottom = PA2KA(ALIGN_UP(p, STACK_SIZE));
 
                 if (config.stack_base < bottom)
@@ -190 +194 @@
         if (ballocs.size) {
                 uintptr_t bottom =
-                    ALIGN_UP(ballocs.base + ballocs.size, PAGE_SIZE);
+                    ALIGN_UP(ballocs.base + ballocs.size, STACK_SIZE);
                 if (config.stack_base < bottom)
                         config.stack_base = bottom;
@@ -196 +200 @@
 
         if (config.stack_base < stack_safe)
-                config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE);
+                config.stack_base = ALIGN_UP(stack_safe, STACK_SIZE);
 
         context_save(&ctx);

kernel/generic/src/proc/thread.c

@@ -194 +194 @@
         kmflags &= ~FRAME_HIGHMEM;
 
+        // XXX: All kernel stacks must be aligned to STACK_SIZE,
+        //      see get_current().
+
         uintptr_t stack_phys =
             frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1);