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

Hold proc->lock while killing the process

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-01-09 00:00:18 +01:00
parent 79768d94e6
commit a5283283f6
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/proc/proc.c
View File

@@ -24,12 +24,6 @@
#include <amd64/intr_defs.h> #include <amd64/intr_defs.h>
#endif #endif
/*
* Lock ordering:
* 1. proc_tree_lock
* 2. [cpu]->lock
*/
static struct rb_node_link* proc_tree = NULL; static struct rb_node_link* proc_tree = NULL;
static spin_lock_t proc_tree_lock = SPIN_LOCK_INIT; static spin_lock_t proc_tree_lock = SPIN_LOCK_INIT;
@@ -266,7 +260,9 @@ void proc_kill (struct proc* proc) {
atomic_store (&proc->state, PROC_DEAD); atomic_store (&proc->state, PROC_DEAD);
spin_lock (&proc_tree_lock); spin_lock (&proc_tree_lock);
spin_lock (&proc->lock);
rbtree_delete (&proc_tree, &proc->proc_tree_link); rbtree_delete (&proc_tree, &proc->proc_tree_link);
spin_unlock (&proc->lock);
spin_unlock (&proc_tree_lock); spin_unlock (&proc_tree_lock);
struct cpu* cpu = proc->cpu; struct cpu* cpu = proc->cpu;