Changeset 4777e02 in mainline

Timestamp:

2023-02-12T22:25:23Z (14 months ago)

Author:

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

Branches:

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

Children:

c7326f21

Parents:

111b9b9

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-12 22:11:54)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-12 22:25:23)

Message:

Make spinlock functions inlineable in non-SMP case

By popular demand.

Location:

kernel/generic

Files:

• include/synch/spinlock.h (modified) (2 diffs)
• src/synch/spinlock.c (modified) (10 diffs)

kernel/generic/include/synch/spinlock.h

@@ -117 +117 @@
         SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, #lock_name)
 
+#ifdef CONFIG_SMP
+
 extern void spinlock_initialize(spinlock_t *, const char *);
 extern bool spinlock_trylock(spinlock_t *);
@@ -122 +124 @@
 extern void spinlock_unlock(spinlock_t *);
 extern bool spinlock_locked(spinlock_t *);
+
+#else
+
+#include <preemption.h>
+
+static inline void spinlock_initialize(spinlock_t *l, const char *name)
+{
+}
+
+static inline bool spinlock_trylock(spinlock_t *l)
+{
+        return true;
+}
+
+static inline void spinlock_lock(spinlock_t *l)
+{
+        preemption_disable();
+}
+
+static inline void spinlock_unlock(spinlock_t *l)
+{
+        preemption_enable();
+}
+
+static inline bool spinlock_locked(spinlock_t *l)
+{
+        return true;
+}
+
+#endif
 
 typedef struct {

kernel/generic/src/synch/spinlock.c

@@ -37 +37 @@
  */
 
+#ifdef CONFIG_SMP
+
 #include <arch/asm.h>
 #include <synch/spinlock.h>
@@ -56 +58 @@
 void spinlock_initialize(spinlock_t *lock, const char *name)
 {
-#ifdef CONFIG_SMP
         atomic_flag_clear_explicit(&lock->flag, memory_order_relaxed);
 #ifdef CONFIG_DEBUG_SPINLOCK
         lock->name = name;
-#endif
 #endif
 }
@@ -73 +73 @@
         preemption_disable();
 
-#ifdef CONFIG_SMP
         bool deadlock_reported = false;
         size_t i = 0;
@@ -120 +119 @@
         if (deadlock_reported)
                 printf("cpu%u: not deadlocked\n", CPU->id);
-
-#endif
 }
 
@@ -130 +127 @@
 void spinlock_unlock(spinlock_t *lock)
 {
-#ifdef CONFIG_SMP
 #ifdef CONFIG_DEBUG_SPINLOCK
         ASSERT_SPINLOCK(spinlock_locked(lock), lock);
@@ -136 +132 @@
 
         atomic_flag_clear_explicit(&lock->flag, memory_order_release);
-#endif
-
         preemption_enable();
 }
@@ -154 +148 @@
         preemption_disable();
 
-#ifdef CONFIG_SMP
         bool ret = !atomic_flag_test_and_set_explicit(&lock->flag, memory_order_acquire);
 
@@ -161 +154 @@
 
         return ret;
-#else
-        return true;
-#endif
 }
 
@@ -173 +163 @@
 bool spinlock_locked(spinlock_t *lock)
 {
-#ifdef CONFIG_SMP
         // NOTE: Atomic flag doesn't support simple atomic read (by design),
         //       so instead we test_and_set and then clear if necessary.
@@ -183 +172 @@
                 atomic_flag_clear_explicit(&lock->flag, memory_order_relaxed);
         return ret;
-#else
-        return true;
-#endif
 }
+
+#endif  /* CONFIG_SMP */
 
 /** @}