Spinlock save cpu flags

kernel/proc/mutex.c

@@ -12,7 +12,9 @@
 #include <sys/spin_lock.h>
 
 void proc_mutexes_cleanup (struct proc* proc, struct reschedule_ctx* rctx) {
-  spin_lock (&proc->procgroup->lock);
+  uint64_t fpg, fr;
+
+  spin_lock (&proc->procgroup->lock, &fpg);
 
   struct rb_node_link* rnode;
   rbtree_first (&proc->procgroup->resource_tree, rnode);
@@ -25,30 +27,32 @@ void proc_mutexes_cleanup (struct proc* proc, struct reschedule_ctx* rctx) {
 
     rnode = next;
 
-    spin_lock (&resource->lock);
+    spin_lock (&resource->lock, &fr);
 
     if (resource->type != PR_MUTEX) {
-      spin_unlock (&resource->lock);
+      spin_unlock (&resource->lock, fr);
       continue;
     }
 
     if (resource->u.mutex.owner == proc && resource->u.mutex.locked) {
-      spin_unlock (&resource->lock);
+      spin_unlock (&resource->lock, fr);
 
       proc_mutex_unlock (proc, &resource->u.mutex, rctx);
     }
 
-    spin_unlock (&resource->lock);
+    spin_unlock (&resource->lock, fr);
   }
 
-  spin_unlock (&proc->procgroup->lock);
+  spin_unlock (&proc->procgroup->lock, fpg);
 }
 
 void proc_cleanup_resource_mutex (struct proc_resource* resource, struct reschedule_ctx* rctx) {
+  uint64_t fr, fsq;
+
   struct proc_mutex* mutex = &resource->u.mutex;
 
-  spin_lock (&mutex->resource->lock);
-  spin_lock (&mutex->suspension_q.lock);
+  spin_lock (&mutex->resource->lock, &fr);
+  spin_lock (&mutex->suspension_q.lock, &fsq);
 
   while (mutex->suspension_q.proc_list != NULL) {
     struct list_node_link* node = mutex->suspension_q.proc_list;
@@ -56,45 +60,49 @@ void proc_cleanup_resource_mutex (struct proc_resource* resource, struct resched
     struct proc* suspended_proc = sq_entry->proc;
 
     /* we will relock during resume */
-    spin_unlock (&mutex->suspension_q.lock);
-    spin_unlock (&mutex->resource->lock);
+    spin_unlock (&mutex->suspension_q.lock, fsq);
+    spin_unlock (&mutex->resource->lock, fr);
 
     proc_sq_resume (suspended_proc, sq_entry, rctx);
 
     /* reacquire */
-    spin_lock (&mutex->resource->lock);
-    spin_lock (&mutex->suspension_q.lock);
+    spin_lock (&mutex->resource->lock, &fr);
+    spin_lock (&mutex->suspension_q.lock, &fsq);
   }
 
   mutex->locked = false;
   mutex->owner = NULL;
 
-  spin_unlock (&mutex->suspension_q.lock);
-  spin_unlock (&mutex->resource->lock);
+  spin_unlock (&mutex->suspension_q.lock, fsq);
+  spin_unlock (&mutex->resource->lock, fr);
 }
 
 void proc_mutex_lock (struct proc* proc, struct proc_mutex* mutex, struct reschedule_ctx* rctx) {
-  spin_lock (&mutex->resource->lock);
+  uint64_t fr;
+
+  spin_lock (&mutex->resource->lock, &fr);
 
   if (!mutex->locked || mutex->owner == proc) {
     mutex->locked = true;
     mutex->owner = proc;
-    spin_unlock (&mutex->resource->lock);
+    spin_unlock (&mutex->resource->lock, fr);
     return;
   }
 
-  proc_sq_suspend (proc, &mutex->suspension_q, &mutex->resource->lock, rctx);
+  proc_sq_suspend (proc, &mutex->suspension_q, &mutex->resource->lock, fr, rctx);
 }
 
 void proc_mutex_unlock (struct proc* proc, struct proc_mutex* mutex, struct reschedule_ctx* rctx) {
-  spin_lock (&mutex->resource->lock);
+  uint64_t fr, fsq;
+
+  spin_lock (&mutex->resource->lock, &fr);
 
   if (mutex->owner != proc) {
-    spin_unlock (&mutex->resource->lock);
+    spin_unlock (&mutex->resource->lock, fr);
     return;
   }
 
-  spin_lock (&mutex->suspension_q.lock);
+  spin_lock (&mutex->suspension_q.lock, &fsq);
 
   struct list_node_link* node = mutex->suspension_q.proc_list;
 
@@ -105,8 +113,8 @@ void proc_mutex_unlock (struct proc* proc, struct proc_mutex* mutex, struct resc
     mutex->owner = resumed_proc;
     mutex->locked = true;
 
-    spin_unlock (&mutex->suspension_q.lock);
-    spin_unlock (&mutex->resource->lock);
+    spin_unlock (&mutex->suspension_q.lock, fsq);
+    spin_unlock (&mutex->resource->lock, fr);
 
     proc_sq_resume (resumed_proc, sq_entry, rctx);
     return;
@@ -115,6 +123,6 @@ void proc_mutex_unlock (struct proc* proc, struct proc_mutex* mutex, struct resc
   mutex->locked = false;
   mutex->owner = NULL;
 
-  spin_unlock (&mutex->suspension_q.lock);
-  spin_unlock (&mutex->resource->lock);
+  spin_unlock (&mutex->suspension_q.lock, fsq);
+  spin_unlock (&mutex->resource->lock, fr);
 }