Changeset 571cc2d in mainline

Timestamp:

2025-04-17T15:14:03Z (5 days ago)

Author:

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

Branches:

master

Children:

d5b37b6

Parents:

af77459

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-11 15:56:15)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-17 15:14:03)

Message:

Use irq_spinlock_t instead of plain spinlock_t in console code

Location:

kernel/generic

Files:

• include/console/console.h (modified) (1 diff)
• src/console/console.c (modified) (6 diffs)
• src/log/log.c (modified) (7 diffs)

kernel/generic/include/console/console.h

@@ -67 +67 @@
 extern void kio_flush(void);
 extern void kio_push_char(const char32_t);
-SPINLOCK_EXTERN(kio_lock);
+extern irq_spinlock_t kio_lock;
 
 extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);

kernel/generic/src/console/console.c

@@ -86 +86 @@
 
 /** Kernel log spinlock */
-SPINLOCK_INITIALIZE_NAME(kio_lock, "kio_lock");
+IRQ_SPINLOCK_INITIALIZE(kio_lock);
 
 /** Physical memory area used for kio buffer */
@@ -254 +254 @@
                 return;
 
-        spinlock_lock(&kio_lock);
+        irq_spinlock_lock(&kio_lock, true);
 
         if (kio_notified != kio_written) {
@@ -261 +261 @@
         }
 
-        spinlock_unlock(&kio_lock);
+        irq_spinlock_unlock(&kio_lock, true);
 }
 
@@ -274 +274 @@
                 return;
 
-        spinlock_lock(&kio_lock);
+        irq_spinlock_lock(&kio_lock, true);
 
         /* Print characters that weren't printed earlier */
@@ -286 +286 @@
                  * the character.
                  */
-                spinlock_unlock(&kio_lock);
+                irq_spinlock_unlock(&kio_lock, true);
                 stdout->op->write(stdout, tmp);
-                spinlock_lock(&kio_lock);
-        }
-
-        spinlock_unlock(&kio_lock);
+                irq_spinlock_lock(&kio_lock, true);
+        }
+
+        irq_spinlock_unlock(&kio_lock, true);
 }
 
@@ -308 +308 @@
         bool ordy = ((stdout) && (stdout->op->write));
 
-        spinlock_lock(&kio_lock);
+        irq_spinlock_lock(&kio_lock, true);
         kio_push_char(ch);
-        spinlock_unlock(&kio_lock);
+        irq_spinlock_unlock(&kio_lock, true);
 
         /* Output stored characters */

kernel/generic/src/log/log.c

@@ -60 +60 @@
 
 /** Cyclic buffer holding the data for kernel log */
-uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
+static uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -66 +66 @@
 
 /** Position in the cyclic buffer where the first log entry starts */
-size_t log_start = 0;
+static size_t log_start = 0;
 
 /** Sum of length of all log entries currently stored in the cyclic buffer */
-size_t log_used = 0;
+static size_t log_used = 0;
 
 /** Log spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(log_lock, "log_lock");
+static IRQ_SPINLOCK_INITIALIZE(log_lock);
 
 /** Overall count of logged messages, which may overflow as needed */
@@ -152 +152 @@
 {
         console_lock();
-        spinlock_lock(&log_lock);
-        spinlock_lock(&kio_lock);
+        irq_spinlock_lock(&log_lock, true);
+        irq_spinlock_lock(&kio_lock, true);
 
         log_current_start = (log_start + log_used) % LOG_LENGTH;
@@ -180 +180 @@
 
         kio_push_char('\n');
-        spinlock_unlock(&kio_lock);
-        spinlock_unlock(&log_lock);
+        irq_spinlock_unlock(&kio_lock, true);
+        irq_spinlock_unlock(&log_lock, true);
 
         /* This has to be called after we released the locks above */
@@ -195 +195 @@
                 return;
 
-        spinlock_lock(&log_lock);
+        irq_spinlock_lock(&log_lock, true);
         if (next_for_uspace < log_used)
                 event_notify_0(EVENT_KLOG, true);
-        spinlock_unlock(&log_lock);
+        irq_spinlock_unlock(&log_lock, true);
 }
 
@@ -307 +307 @@
                 rc = EOK;
 
-                spinlock_lock(&log_lock);
+                irq_spinlock_lock(&log_lock, true);
 
                 while (next_for_uspace < log_used) {
@@ -337 +337 @@
                 }
 
-                spinlock_unlock(&log_lock);
+                irq_spinlock_unlock(&log_lock, true);
 
                 if (rc != EOK) {