Changeset 74b92e6 in mainline

Timestamp:

2025-04-12T15:55:08Z (2 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

1cea9c0, 2ef2a0d

Parents:

8165a7a

Message:

Fix sysinfo locking

Turns out sysinfo doesn't like spinlock

File:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -34 +34 @@
  */
 
+#include <arch/asm.h>
 #include <assert.h>
-#include <sysinfo/sysinfo.h>
+#include <errno.h>
+#include <macros.h>
 #include <mm/slab.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <synch/mutex.h>
 #include <syscall/copy.h>
-#include <synch/mutex.h>
-#include <arch/asm.h>
-#include <errno.h>
-#include <macros.h>
-#include <stdlib.h>
+#include <sysinfo/sysinfo.h>
 
 /** Maximal sysinfo path length */
@@ -57 +57 @@
 
 /** Sysinfo lock */
-static IRQ_SPINLOCK_INITIALIZE(sysinfo_lock);
+static MUTEX_INITIALIZE(sysinfo_lock, MUTEX_PASSIVE);
 
 /** Sysinfo item constructor
@@ -327 +327 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -340 +340 @@
         }
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -360 +360 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -374 +374 @@
         }
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -390 +390 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -404 +404 @@
         }
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -425 +425 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -439 +439 @@
         }
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -452 +452 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -463 +463 @@
                 printf("Could not set sysinfo item %s.\n", name);
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -479 +479 @@
 {
         /* Protect sysinfo tree consistency */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -498 +498 @@
         }
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -596 +596 @@
          * while we are dumping it
          */
-        irq_spinlock_lock(&sysinfo_lock, true);
+        mutex_lock(&sysinfo_lock);
 
         if (root == NULL)
@@ -603 +603 @@
                 sysinfo_dump_internal(root, 0);
 
-        irq_spinlock_unlock(&sysinfo_lock, true);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -695 +695 @@
                  * are reading it.
                  */
-                irq_spinlock_lock(&sysinfo_lock, true);
+                mutex_lock(&sysinfo_lock);
                 ret = sysinfo_get_item(path, NULL, dry_run);
-                irq_spinlock_unlock(&sysinfo_lock, true);
+                mutex_unlock(&sysinfo_lock);
         }
 
@@ -806 +806 @@
                  * are reading it.
                  */
-                irq_spinlock_lock(&sysinfo_lock, true);
+                mutex_lock(&sysinfo_lock);
                 ret = sysinfo_get_keys(path, NULL, dry_run);
-                irq_spinlock_unlock(&sysinfo_lock, true);
+                mutex_unlock(&sysinfo_lock);
         }