Changeset b076dfb in mainline for kernel/generic/src/synch/irq_spinlock.c

Timestamp:

2023-02-02T21:58:36Z (15 months ago)

Author:

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

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e9cf4

Parents:

2b264c4

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-01-20 19:05:09)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-02 21:58:36)

Message:

Implement more elaborate debug checking for spinlocks

File:

• kernel/generic/src/synch/irq_spinlock.c (modified) (12 diffs)

kernel/generic/src/synch/irq_spinlock.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2023 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <synch/spinlock.h>
 
+#include <cpu.h>
+
+#ifdef CONFIG_DEBUG_SPINLOCK
+
+#define CPU_OWNER ((CPU == NULL) ? (cpu_t *) UINTPTR_MAX : CPU)
+
+static inline bool owned_by_me(irq_spinlock_t *lock)
+{
+        return atomic_load_explicit(&lock->owner, memory_order_relaxed) == CPU_OWNER;
+}
+
+static inline bool not_owned_by_me(irq_spinlock_t *lock)
+{
+        return !owned_by_me(lock);
+}
+
+static inline void claim(irq_spinlock_t *lock)
+{
+        cpu_t *cpu = CPU_OWNER;
+        atomic_store_explicit(&lock->owner, cpu, memory_order_relaxed);
+        CURRENT->mutex_locks++;
+}
+
+static inline void unclaim(irq_spinlock_t *lock)
+{
+        CURRENT->mutex_locks--;
+        atomic_store_explicit(&lock->owner, NULL, memory_order_relaxed);
+}
+
+#else
+
+static inline bool owned_by_me(irq_spinlock_t *lock)
+{
+        return true;
+}
+
+static inline bool not_owned_by_me(irq_spinlock_t *lock)
+{
+        return true;
+}
+
+static inline void claim(irq_spinlock_t *lock)
+{
+}
+
+static inline void unclaim(irq_spinlock_t *lock)
+{
+}
+
+#endif
+
 /** Initialize interrupts-disabled spinlock
  *
@@ -47 +99 @@
 void irq_spinlock_initialize(irq_spinlock_t *lock, const char *name)
 {
-        spinlock_initialize(&(lock->lock), name);
-        lock->guard = false;
-        lock->ipl = 0;
+        *lock = (irq_spinlock_t) IRQ_SPINLOCK_INITIALIZER(name);
 }
 
@@ -63 +113 @@
 void irq_spinlock_lock(irq_spinlock_t *lock, bool irq_dis)
 {
+        ASSERT_IRQ_SPINLOCK(not_owned_by_me(lock), lock);
+
         if (irq_dis) {
                 ipl_t ipl = interrupts_disable();
@@ -75 +127 @@
                 ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
         }
+
+        claim(lock);
 }
 
@@ -89 +143 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
+        ASSERT_IRQ_SPINLOCK(owned_by_me(lock), lock);
+
+        unclaim(lock);
 
         if (irq_res) {
@@ -119 +176 @@
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
         bool ret = spinlock_trylock(&(lock->lock));
+        if (ret)
+                claim(lock);
 
         ASSERT_IRQ_SPINLOCK((!ret) || (!lock->guard), lock);
@@ -138 +197 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock);
+        ASSERT_IRQ_SPINLOCK(owned_by_me(unlock), unlock);
+        ASSERT_IRQ_SPINLOCK(not_owned_by_me(lock), lock);
 
         /* Pass guard from unlock to lock */
@@ -144 +205 @@
         unlock->guard = false;
 
+        unclaim(unlock);
+
         spinlock_unlock(&(unlock->lock));
         spinlock_lock(&(lock->lock));
+
+        claim(lock);
 
         ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
@@ -169 +234 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock);
+        ASSERT_IRQ_SPINLOCK(owned_by_me(unlock), unlock);
+        ASSERT_IRQ_SPINLOCK(not_owned_by_me(lock), lock);
 
         spinlock_lock(&(lock->lock));
@@ -180 +247 @@
         }
 
+        claim(lock);
+        unclaim(unlock);
+
         spinlock_unlock(&(unlock->lock));
 }
@@ -188 +258 @@
  * @return              True if the IRQ spinlock is locked, false otherwise.
  */
-bool irq_spinlock_locked(irq_spinlock_t *ilock)
-{
-        return spinlock_locked(&ilock->lock);
+bool irq_spinlock_locked(irq_spinlock_t *lock)
+{
+        return owned_by_me(lock) && spinlock_locked(&lock->lock);
 }