mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: runinit

Browse Source
This commit is contained in:
Matheus
2023-05-07 20:26:12 -03:00
parent 8c3b2f4947
commit 25778838ba
2 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/main.c
+3 -2
View File
@@ -39,7 +39,7 @@ void kernel_entry() {
alloc_init(); alloc_init();
arch_acpi_init(); arch_acpi_init();
arch_apic_init(); arch_apic_init();
arch_apic_initap(); cpu_initstate();
// XXX fall back to another clock source // XXX fall back to another clock source
time_t u = arch_hpet_init(); time_t u = arch_hpet_init();
timekeeper_init(arch_hpet_ticks, u); timekeeper_init(arch_hpet_ticks, u);
@@ -66,5 +66,6 @@ void kernel_entry() {
console_init(); console_init();
logging_sethook(console_putc); logging_sethook(console_putc);
__assert(!"kernel entry end"); sched_runinit();
sched_threadexit();
} }
kernel-src/sys/scheduler.c
+44 -3
View File
@@ -6,6 +6,7 @@
#include <kernel/vmm.h> #include <kernel/vmm.h>
#include <kernel/alloc.h> #include <kernel/alloc.h>
#include <errno.h> #include <errno.h>
#include <kernel/elf.h>
#define QUANTUM_US 100000 #define QUANTUM_US 100000
#define SCHEDULER_STACK_SIZE 4096 #define SCHEDULER_STACK_SIZE 4096
@@ -275,11 +276,11 @@ static void timerhook(void *private, context_t *context) {
runqueueinsert(current); runqueueinsert(current);
ARCH_CONTEXT_THREADLOAD(next, context); ARCH_CONTEXT_THREADLOAD(next, context);
if (next->vmmctx != current->vmmctx) _cpu()->thread = next;
vmm_switchcontext(next->vmmctx);
next->flags |= SCHED_THREAD_FLAGS_RUNNING; next->flags |= SCHED_THREAD_FLAGS_RUNNING;
next->cpu = _cpu(); next->cpu = _cpu();
_cpu()->thread = next; if (next->vmmctx != current->vmmctx)
vmm_switchcontext(next->vmmctx);
} }
spinlock_release(&runqueuelock); spinlock_release(&runqueuelock);
@@ -315,3 +316,43 @@ void sched_init() {
// XXX move this resume to a more appropriate place // XXX move this resume to a more appropriate place
timer_resume(_cpu()->timer); timer_resume(_cpu()->timer);
} }
#define STACK_TOP (void *)0x0000800000000000
void sched_runinit() {
printf("sched: loading /init\n");
vmmcontext_t *vmmctx = vmm_newcontext();
__assert(vmmctx);
// leave kernel context to load elf
vmm_switchcontext(vmmctx);
proc_t *proc = sched_newproc();
__assert(proc);
vnode_t *initnode;
__assert(vfs_open(vfsroot, "/init", 0, &initnode) == 0);
auxv64list_t auxv64;
char *interp = NULL;
void *entry;
__assert(elf_load(initnode, NULL, &entry, &interp, &auxv64) == 0);
char *argv = {NULL};
char *envp = {NULL};
void *stack = elf_preparestack(STACK_TOP, &auxv64, &argv, &envp);
__assert(stack);
// reenter kernel context
vmm_switchcontext(&vmm_kernelctx);
thread_t *uthread = sched_newthread(entry, PAGE_SIZE * 16, 1, proc, stack);
__assert(uthread);
uthread->vmmctx = vmmctx;
sched_queue(uthread);
VOP_RELEASE(initnode);
}