Remove spinlock contexts

kernel/proc/procgroup.c

@@ -1,5 +1,6 @@
 #include <libk/rbtree.h>
 #include <libk/std.h>
+#include <libk/string.h>
 #include <mm/liballoc.h>
 #include <mm/pmm.h>
 #include <proc/proc.h>
@@ -14,16 +15,14 @@ static atomic_int pgids = 0;
 
 uintptr_t procgroup_map (struct procgroup* procgroup, uintptr_t vaddr, size_t pages, uint32_t flags,
                          uintptr_t* out_paddr) {
-  spin_lock_ctx_t ctxpg;
-
-  spin_lock (&procgroup->lock, &ctxpg);
+  spin_lock (&procgroup->lock);
 
   vaddr = (vaddr == 0) ? procgroup->map_base : vaddr;
 
   struct proc_mapping* mapping = malloc (sizeof (*mapping));
 
   if (mapping == NULL) {
-    spin_unlock (&procgroup->lock, &ctxpg);
+    spin_unlock (&procgroup->lock);
     return 0;
   }
 
@@ -31,7 +30,7 @@ uintptr_t procgroup_map (struct procgroup* procgroup, uintptr_t vaddr, size_t pa
 
   if (paddr == PMM_ALLOC_ERR) {
     free (mapping);
-    spin_unlock (&procgroup->lock, &ctxpg);
+    spin_unlock (&procgroup->lock);
     return 0;
   }
 
@@ -51,7 +50,7 @@ uintptr_t procgroup_map (struct procgroup* procgroup, uintptr_t vaddr, size_t pa
     mm_map_page (&procgroup->pd, ppage, vpage, flags);
   }
 
-  spin_unlock (&procgroup->lock, &ctxpg);
+  spin_unlock (&procgroup->lock);
 
   return vaddr;
 }
@@ -63,13 +62,12 @@ bool procgroup_unmap (struct procgroup* procgroup, uintptr_t start_vaddr, size_t
   struct list_node_link *mapping_link, *mapping_link_tmp;
 
   bool used_tail_mapping = false;
-  spin_lock_ctx_t ctxpg;
 
   struct proc_mapping* tail_mapping = malloc (sizeof (*tail_mapping));
   if (tail_mapping == NULL)
     return false;
 
-  spin_lock (&procgroup->lock, &ctxpg);
+  spin_lock (&procgroup->lock);
 
   list_foreach (procgroup->mappings, mapping_link, mapping_link_tmp) {
     struct proc_mapping* mapping =
@@ -122,19 +120,19 @@ bool procgroup_unmap (struct procgroup* procgroup, uintptr_t start_vaddr, size_t
     mm_unmap_page (&procgroup->pd, vpage);
   }
 
-  spin_unlock (&procgroup->lock, &ctxpg);
+  spin_unlock (&procgroup->lock);
 
   return true;
 }
 
 struct procgroup* procgroup_create (void) {
-  spin_lock_ctx_t ctxpgtr;
-
   struct procgroup* procgroup = malloc (sizeof (*procgroup));
   if (procgroup == NULL) {
     return NULL;
   }
 
+  memset (procgroup, 0, sizeof (*procgroup));
+
   procgroup->refs = 0;
   procgroup->memb_proc_tree = NULL;
   procgroup->lock = SPIN_LOCK_INIT;
@@ -142,48 +140,44 @@ struct procgroup* procgroup_create (void) {
   procgroup->pd.cr3_paddr = mm_alloc_user_pd_phys ();
   procgroup->map_base = PROC_MAP_BASE;
 
-  spin_lock (&procgroup_tree_lock, &ctxpgtr);
+  spin_lock (&procgroup_tree_lock);
   rbtree_insert (struct procgroup, &procgroup_tree, &procgroup->procgroup_tree_link,
                  procgroup_tree_link, pgid);
-  spin_unlock (&procgroup_tree_lock, &ctxpgtr);
+  spin_unlock (&procgroup_tree_lock);
 
   return procgroup;
 }
 
 void procgroup_attach (struct procgroup* procgroup, struct proc* proc) {
-  spin_lock_ctx_t ctxpg, ctxpr;
-
-  spin_lock (&procgroup->lock, &ctxpg);
-  spin_lock (&proc->lock, &ctxpr);
+  spin_lock (&procgroup->lock);
+  spin_lock (&proc->lock);
 
   rbtree_insert (struct proc, &procgroup->memb_proc_tree, &proc->procgroup_memb_tree_link,
                  procgroup_memb_tree_link, pid);
   atomic_fetch_add (&procgroup->refs, 1);
 
-  spin_unlock (&proc->lock, &ctxpr);
-  spin_unlock (&procgroup->lock, &ctxpg);
+  spin_unlock (&proc->lock);
+  spin_unlock (&procgroup->lock);
 }
 
 void procgroup_detach (struct procgroup* procgroup, struct proc* proc) {
-  spin_lock_ctx_t ctxpg, ctxpr, ctxpgtr;
-
-  spin_lock (&procgroup->lock, &ctxpg);
-  spin_lock (&proc->lock, &ctxpr);
+  spin_lock (&procgroup->lock);
+  spin_lock (&proc->lock);
 
   rbtree_delete (&procgroup->memb_proc_tree, &proc->procgroup_memb_tree_link);
   int refs = atomic_fetch_sub (&procgroup->refs, 1);
 
-  spin_unlock (&proc->lock, &ctxpr);
-  spin_unlock (&procgroup->lock, &ctxpg);
+  spin_unlock (&proc->lock);
+  spin_unlock (&procgroup->lock);
 
   if (refs == 1) {
-    spin_lock (&procgroup_tree_lock, &ctxpgtr);
-    spin_lock (&procgroup->lock, &ctxpg);
+    spin_lock (&procgroup_tree_lock);
+    spin_lock (&procgroup->lock);
 
     rbtree_delete (&procgroup_tree, &procgroup->procgroup_tree_link);
 
-    spin_unlock (&procgroup->lock, &ctxpg);
-    spin_unlock (&procgroup_tree_lock, &ctxpgtr);
+    spin_unlock (&procgroup->lock);
+    spin_unlock (&procgroup_tree_lock);
 
     /* delete resources */
     struct rb_node_link* rnode;