Changeset ed7e057 in mainline for kernel/generic/src

Timestamp:

2024-01-16T15:46:47Z (19 months ago)

Author:

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

Branches:

master

Children:

29029ac0, a5b5f17

Parents:

4ed7870

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-15 20:09:30)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-16 15:46:47)

Message:

Add functions context_create(), context_replace() and context_swap()

and use them where appropriate, removing context_save() in the process.
Much like in userspace, context_swap() maintains natural control flow
as opposed to context_save()'s return-twice mechanic.

Beyond that, in the future, context_replace() and context_swap()
can be implemented more efficiently than the context_save()/
context_restore() pair. As of now, the original implementation is
retained.

Location:

kernel/generic/src

Files:

• main/main.c (modified) (3 diffs)
• proc/scheduler.c (modified) (3 diffs)
• proc/thread.c (modified) (2 diffs)

kernel/generic/src/main/main.c

@@ -80 +80 @@
 #include <arch/arch.h>
 #include <arch.h>
-#include <arch/faddr.h>
 #include <ipc/ipc.h>
 #include <macros.h>
@@ -174 +173 @@
             ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 
-        context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack),
+        context_create(&ctx, main_bsp_separated_stack,
             bootstrap_stack, bootstrap_stack_size);
         context_restore(&ctx);
@@ -336 +334 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        context_t ctx;
-        context_save(&ctx);
-        context_set(&ctx, FADDR(main_ap_separated_stack),
-            (uintptr_t) CPU_LOCAL->stack, STACK_SIZE);
-        context_restore(&ctx);
+        context_replace(main_ap_separated_stack, CPU_LOCAL->stack, STACK_SIZE);
         /* not reached */
 }

kernel/generic/src/proc/scheduler.c

@@ -309 +309 @@
 
         current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
-
-        context_t ctx;
-        context_save(&ctx);
-        context_set(&ctx, FADDR(scheduler_separated_stack),
-            (uintptr_t) CPU_LOCAL->stack, STACK_SIZE);
-        context_restore(&ctx);
-
+        context_replace(scheduler_separated_stack, CPU_LOCAL->stack, STACK_SIZE);
         unreachable();
 }
@@ -452 +446 @@
                 /* Prefer the thread after it's woken up. */
                 THREAD->priority = -1;
-        }
-
-        if (!context_save(&THREAD->saved_context)) {
-                /*
-                 * This is the place where threads leave scheduler();
-                 */
-
-                irq_spinlock_unlock(&THREAD->lock, false);
-                interrupts_restore(ipl);
-                return;
         }
 
@@ -486 +470 @@
          */
         context_t ctx;
-        context_save(&ctx);
-        context_set(&ctx, FADDR(scheduler_separated_stack),
-            (uintptr_t) CPU_LOCAL->stack, STACK_SIZE);
-        context_restore(&ctx);
-
-        /* Not reached */
+        context_create(&ctx, scheduler_separated_stack,
+            CPU_LOCAL->stack, STACK_SIZE);
+
+        /* Switch to scheduler context and store current thread's context. */
+        context_swap(&THREAD->saved_context, &ctx);
+
+        /* Returned from scheduler. */
+
+        irq_spinlock_unlock(&THREAD->lock, false);
+        interrupts_restore(ipl);
 }
 

kernel/generic/src/proc/thread.c

@@ -60 +60 @@
 #include <arch/interrupt.h>
 #include <smp/ipi.h>
-#include <arch/faddr.h>
 #include <atomic.h>
 #include <memw.h>
@@ -310 +309 @@
         irq_spinlock_unlock(&tidlock, true);
 
-        memset(&thread->saved_context, 0, sizeof(thread->saved_context));
-        context_set(&thread->saved_context, FADDR(cushion),
-            (uintptr_t) thread->kstack, STACK_SIZE);
+        context_create(&thread->saved_context, cushion, thread->kstack, STACK_SIZE);
 
         current_initialize((current_t *) thread->kstack);