kamkow1/mop3
1
1
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Use intr_enable() and intr_disable() to perform cli/sti
All checks were successful
Build ISO image / build-and-deploy (push) Successful in 1m30s
Details
Build documentation / build-and-deploy (push) Successful in 48s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-04-26 23:06:12 +02:00
parent a2ed5c2b8a
commit c191ac0a50
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/amd64/bootmain.c
View File

@@ -24,6 +24,7 @@
#include <proc/proc.h> #include <proc/proc.h>
#include <proc/reschedule.h> #include <proc/reschedule.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/intr.h>
#include <sys/mm.h> #include <sys/mm.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/spin.h> #include <sys/spin.h>
@@ -70,7 +71,7 @@ void bootmain(void) {
lapic_init(1000); lapic_init(1000);
__asm__ volatile("sti"); intr_enable();
devices_init(); devices_init();
vfs_init(); vfs_init();

5
kernel/amd64/intr.c
View File

@@ -11,6 +11,7 @@
#include <libk/string.h> #include <libk/string.h>
#include <proc/reschedule.h> #include <proc/reschedule.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/intr.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/spin.h> #include <sys/spin.h>
#include <syscall/syscall.h> #include <syscall/syscall.h>
@@ -254,6 +255,10 @@ void intr_handler(void* stack_ptr) {
} }
} }
void intr_disable(void) { __asm__ volatile("cli" ::: "memory"); }
void intr_enable(void) { __asm__ volatile("sti" ::: "memory"); }
/* Initialize interrupts */ /* Initialize interrupts */
void intr_init(void) { void intr_init(void) {
pic_init(); pic_init();

3
kernel/amd64/sched1.c
View File

@@ -8,13 +8,14 @@
#include <proc/proc.h> #include <proc/proc.h>
#include <sync/spin_lock.h> #include <sync/spin_lock.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/intr.h>
#include <sys/mm.h> #include <sys/mm.h>
#include <sys/smp.h> #include <sys/smp.h>
void do_sched(struct proc* proc, spin_lock_t* cpu_lock) { void do_sched(struct proc* proc, spin_lock_t* cpu_lock) {
uint64_t fp; uint64_t fp;
__asm__ volatile("cli"); intr_disable();
spin_lock(&proc->lock, &fp); spin_lock(&proc->lock, &fp);

3
kernel/amd64/smp.c
View File

@@ -14,6 +14,7 @@
#include <proc/reschedule.h> #include <proc/reschedule.h>
#include <sync/spin_lock.h> #include <sync/spin_lock.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/intr.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@@ -108,7 +109,7 @@ static void smp_bootstrap(struct limine_mp_info* mp_info) {
atomic_fetch_sub(&cpu_counter, 1); atomic_fetch_sub(&cpu_counter, 1);
__asm__ volatile("sti"); intr_enable();
struct reschedule_ctx rctx; struct reschedule_ctx rctx;
memset(&rctx, 0, sizeof(rctx)); memset(&rctx, 0, sizeof(rctx));

5
kernel/amd64/syscall.c
View File

@@ -13,6 +13,7 @@
#include <proc/reschedule.h> #include <proc/reschedule.h>
#include <status.h> #include <status.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/intr.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <syscall/syscall.h> #include <syscall/syscall.h>
#include <syscall_defs.h> #include <syscall_defs.h>
@@ -51,12 +52,12 @@ uintptr_t syscall_dispatch(void* stack_ptr) {
lapic_timer_mask(); lapic_timer_mask();
__asm__ volatile("sti"); intr_enable();
uintptr_t r = uintptr_t r =
func(caller, regs, &rctx, regs->rdi, regs->rsi, regs->rdx, regs->r10, regs->r8, regs->r9); func(caller, regs, &rctx, regs->rdi, regs->rsi, regs->rdx, regs->r10, regs->r8, regs->r9);
__asm__ volatile("cli"); intr_disable();
lapic_timer_unmask(); lapic_timer_unmask();

8
kernel/sys/intr.h Normal file
View File

@@ -0,0 +1,8 @@
#ifndef _KERNEL_SYS_INTR_H
#define _KERNEL_SYS_INTR_H
void intr_disable(void);
void intr_enable(void);
#endif // _KERNEL_SYS_INTR_H