From e0449c5adc89eec9f378cb40a56762bf314a80ea Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 15 Sep 2018 23:46:04 +0200 Subject: scheduler / sleep process --- kernel/exceptions.c | 3 +- kernel/interrupts.c | 88 +++++++++++++++++++++++++---------------------------- kernel/scheduler.c | 75 ++++++++++++++++++++++++++++++++++++--------- kernel/scheduler.h | 5 +-- 4 files changed, 108 insertions(+), 63 deletions(-) (limited to 'kernel') diff --git a/kernel/exceptions.c b/kernel/exceptions.c index 4ad87e8..a69a49e 100644 --- a/kernel/exceptions.c +++ b/kernel/exceptions.c @@ -126,6 +126,7 @@ uint32_t exception_handle(uint32_t esp, uint32_t irq) klog("killing task in question!"); task_syscall(SYSCALL_EXIT,task_get_current_pid(),0,0); - return scheduler_run(esp,0); + scheduler_wake_all(); + return scheduler_run(esp); } diff --git a/kernel/interrupts.c b/kernel/interrupts.c index 150a784..9c485cc 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -9,6 +9,10 @@ #include "asm_x86.h" #include "smp.h" #include "apic.h" +#include "ringbuffer.h" + +ringbuffer mouse_in; +ringbuffer kb_in; /** The size of our interrupts table */ #define INT_MAX 256 // 0-255 @@ -51,57 +55,45 @@ static void int_install_ir(int irq, uint16_t flags, uint16_t sel, void *addr) */ uint32_t interrupt_handler(uint32_t esp, uint32_t irq) { - // pit timer at 1/25 sec. - if(irq==INTERRUPT_PIT_TIMER)asm_pit_tick(); + uint32_t *stack; - // kb - if(irq==INTERRUPT_KEYBOARD) + // process irq + switch(irq) { - uint32_t in=x86_inb(0x60); + case INTERRUPT_PIT_TIMER: + asm_pit_tick(); + break; + + case INTERRUPT_KEYBOARD: + ringbuffer_put(&kb_in,x86_inb(0x60)); + break; + + case INTERRUPT_MOUSE: + ringbuffer_put(&mouse_in,x86_inb(0x60)); + break; + + case INTERRUPT_SYSCALL: + stack=esp; + task_syscall(stack[11],stack[8],stack[10],stack[9]); //eax,ebx,ecx,edx + break; + + case INTERRUPT_APIC_TIMER: + case INTERRUPT_IPI: + esp=scheduler_run(esp); + break; + + case 255: // default or spurious + kpanic("Spurious/Unknown Interrupt!?"); + break; } - // mouse - if(irq==INTERRUPT_MOUSE) - { - uint32_t in=x86_inb(0x60); - - /* - if(irq==INTERRUPT_KEYBOARD){ - keyboard_handle(in); // do this in separate thread via syscalls? - task_wake_all(); - } - */ - // TODO: mouse - - // test ipi - //apic_ipi(2,0x81); // force cpu16 to autoschedule? just test - //klog("0x60 in %d",in); - } + // reschedule to kernel worker on these + if(irq==INTERRUPT_SYSCALL||irq==INTERRUPT_KEYBOARD||irq==INTERRUPT_MOUSE) + esp=scheduler_wake_worker(esp); - // 0x80 - a syscall is coming in - if(irq==INTERRUPT_SYSCALL) - { - uint32_t *stack=esp; - uint32_t eax=stack[11]; - uint32_t ebx=stack[8]; - uint32_t ecx=stack[10]; - uint32_t edx=stack[9]; - - task_syscall(eax,ebx,ecx,edx); - esp=scheduler_run(esp,2); - } - - // schedules on APIC timer 0x8C and IPI 0x81 - if(irq==INTERRUPT_APIC_TIMER || irq==INTERRUPT_IPI) - { - esp=scheduler_run(esp,-1); - } - - // ack all except software syscalls - if(irq!=INTERRUPT_SYSCALL)apic_eoi(); - - // default and spurious - if(irq==255)kpanic("Spurious/Unknown Interrupt!?"); + // ack all to LAPIC, except software syscalls + if(irq!=INTERRUPT_SYSCALL) + apic_eoi(); return esp; } @@ -111,6 +103,10 @@ uint32_t interrupt_handler(uint32_t esp, uint32_t irq) */ void interrupts_init(uint16_t sel) { + klog("initializing Mouse and Kb input buffers"); + kb_in=ringbuffer_init(1);// 4096 bytes ringbuffer; + mouse_in=ringbuffer_init(1);// 4096 bytes ringbuffer; + klog("initializing. IDT: 0x%08x, IDTD: 0x%08X",&idt,&idtd); // Default interrupt handling diff --git a/kernel/scheduler.c b/kernel/scheduler.c index ad6b370..b5d1b34 100644 --- a/kernel/scheduler.c +++ b/kernel/scheduler.c @@ -73,25 +73,36 @@ volatile void scheduler_init(uint32_t cpu, void *dir) task_list[cpu][0].pid=nextPID(); task_list[cpu][0].active=true; task_list[cpu][0].syscall=false; - task_list[cpu][0].thread=false; + task_list[cpu][1].thread=false; task_list[cpu][0].vmem=dir; task_list[cpu][0].esp = VMEM_CPU_STACK_TOP-0x200; task_list[cpu][0].esp0 = 0; // esp0 not needed by kernel space tasks - task_pusha(task_list[cpu][0].esp); - - // this is our main kernel task at slot 0 (per cpu) + // this will go to userspace task_list[cpu][1].parent=0; task_list[cpu][1].pid=nextPID(); task_list[cpu][1].active=true; - task_list[cpu][0].thread=false; + task_list[cpu][1].thread=false; task_list[cpu][1].syscall=false; task_list[cpu][1].vmem=dir; task_list[cpu][1].esp = kballoc(4)+4*4096-0x200; // 4 pages stack task_list[cpu][1].esp0 =kballoc(4)+4*4096; // esp0 not needed by kernel space tasks + + // sleeper + task_list[cpu][2].parent=0; + task_list[cpu][2].pid=nextPID(); + task_list[cpu][2].active=true; + task_list[cpu][2].thread=false; + task_list[cpu][2].syscall=false; + task_list[cpu][2].vmem=dir; + task_list[cpu][2].esp = kballoc(4)+4*4096-0x200; // 4 pages stack + task_list[cpu][2].esp0 =kballoc(4)+4*4096; // esp0 not needed by kernel space tasks + + // stacks task_pusha(task_list[cpu][0].esp); task_pusha(task_list[cpu][1].esp); + task_pusha(task_list[cpu][2].esp); } // @@ -104,7 +115,7 @@ volatile void scheduler_init(uint32_t cpu, void *dir) // // we need to return a NEW stack pointer where popa will get the registers the new task requires // -volatile uint32_t scheduler_run(uint32_t oldesp,uint32_t force_pid) +volatile uint32_t scheduler_run(uint32_t oldesp) { uint32_t cpu=smp_get(SMP_APIC_ID); uint32_t init=smp_get(SMP_SCHEDULER_INIT); @@ -117,6 +128,7 @@ volatile uint32_t scheduler_run(uint32_t oldesp,uint32_t force_pid) for(int i=0;i // http://hosted.cjmovie.net/TutMultitask.htm -volatile uint32_t scheduler_run(uint32_t oldesp,uint32_t force_pid); +volatile uint32_t scheduler_run(uint32_t oldesp); +volatile uint32_t scheduler_wake_worker(uint32_t oldesp); -void task_wake_all(); +void scheduler_wake_all(); volatile uint32_t task_get_current_pid(); volatile uint32_t task_get_parent(uint32_t pid); volatile void task_set_brk(uint32_t pid,uint32_t brk); -- cgit v1.2.3