Changes in kernel/generic/src/sysinfo/sysinfo.c [c6218327:b4ad39f] in mainline

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (20 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -37 +37 @@
 #include <print.h>
 #include <syscall/copy.h>
-#include <synch/mutex.h>
+#include <synch/spinlock.h>
 #include <arch/asm.h>
 #include <errno.h>
@@ -52 +52 @@
 static slab_cache_t *sysinfo_item_slab;
 
-/** Sysinfo lock */
-static mutex_t sysinfo_lock;
+/** Sysinfo spinlock */
+SPINLOCK_STATIC_INITIALIZE_NAME(sysinfo_lock, "sysinfo_lock");
 
 /** Sysinfo item constructor
@@ -98 +98 @@
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);
-
-        mutex_initialize(&sysinfo_lock, MUTEX_ACTIVE);
 }
 
 /** Recursively find an item in sysinfo tree
  *
- * Should be called with sysinfo_lock held.
+ * Should be called with interrupts disabled
+ * and sysinfo_lock held.
  *
  * @param name    Current sysinfo path suffix.
@@ -169 +168 @@
 /** Recursively create items in sysinfo tree
  *
- * Should be called with sysinfo_lock held.
+ * Should be called with interrupts disabled
+ * and sysinfo_lock held.
  *
  * @param name     Current sysinfo path suffix.
@@ -299 +299 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -310 +311 @@
         }
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -330 +332 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -342 +345 @@
         }
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -357 +361 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -368 +373 @@
         }
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -388 +394 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -399 +406 @@
         }
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -412 +420 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -421 +430 @@
                 item->val_type = SYSINFO_VAL_UNDEFINED;
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -436 +446 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -450 +461 @@
         }
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
@@ -467 +479 @@
 /** Dump the structure of sysinfo tree
  *
- * Should be called with sysinfo_lock held.
+ * Should be called with interrupts disabled
+ * and sysinfo_lock held. Because this routine
+ * might take a reasonable long time to proceed,
+ * having the spinlock held is not optimal, but
+ * there is no better simple solution.
  *
  * @param root  Root item of the current (sub)tree.
@@ -543 +559 @@
         /* Avoid other functions to mess with sysinfo
            while we are dumping it */
-        mutex_lock(&sysinfo_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -550 +567 @@
                 sysinfo_dump_internal(root, 0);
         
-        mutex_unlock(&sysinfo_lock);
+        spinlock_unlock(&sysinfo_lock);
+        interrupts_restore(ipl);
 }
 
 /** Return sysinfo item value determined by name
  *
- * Should be called with sysinfo_lock held.
+ * Should be called with interrupts disabled
+ * and sysinfo_lock held.
  *
  * @param name    Sysinfo path.
@@ -640 +659 @@
                  * are reading it.
                  */
-                mutex_lock(&sysinfo_lock);
+                ipl_t ipl = interrupts_disable();
+                spinlock_lock(&sysinfo_lock);
                 ret = sysinfo_get_item(path, NULL, dry_run);
-                mutex_unlock(&sysinfo_lock);
+                spinlock_unlock(&sysinfo_lock);
+                interrupts_restore(ipl);
         }
         free(path);