Changeset f43d8ce in mainline for kernel/generic/src/synch/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:

2b264c4

Parents:

95658c9

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-01-19 22:40:04)

git-committer:

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

Message:

Make spinlock_lock/unlock into proper functions in all configurations

File:

• kernel/generic/src/synch/spinlock.c (modified) (9 diffs)

kernel/generic/src/synch/spinlock.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2023 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -47 +48 @@
 #include <cpu.h>
 
-#ifdef CONFIG_SMP
-
 /** Initialize spinlock
  *
@@ -56 +55 @@
 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
 }
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-
 /** Lock spinlock
- *
- * Lock spinlock.
- * This version has limitted ability to report
- * possible occurence of deadlock.
  *
  * @param lock Pointer to spinlock_t structure.
  *
  */
-void spinlock_lock_debug(spinlock_t *lock)
+void spinlock_lock(spinlock_t *lock)
 {
+        preemption_disable();
+
+#ifdef CONFIG_SMP
+        bool deadlock_reported = false;
         size_t i = 0;
-        bool deadlock_reported = false;
 
-        preemption_disable();
         while (atomic_flag_test_and_set_explicit(&lock->flag, memory_order_acquire)) {
+#ifdef CONFIG_DEBUG_SPINLOCK
                 /*
                  * We need to be careful about particular locks
@@ -111 +109 @@
                         deadlock_reported = true;
                 }
+#endif
         }
+
+        /* Avoid compiler warning with debug disabled. */
+        (void) i;
 
         if (deadlock_reported)
                 printf("cpu%u: not deadlocked\n", CPU->id);
+
+#endif
 }
 
 /** Unlock spinlock
  *
- * Unlock spinlock.
- *
  * @param sl Pointer to spinlock_t structure.
  */
-void spinlock_unlock_debug(spinlock_t *lock)
+void spinlock_unlock(spinlock_t *lock)
 {
+#ifdef CONFIG_SMP
+#ifdef CONFIG_DEBUG_SPINLOCK
         ASSERT_SPINLOCK(spinlock_locked(lock), lock);
+#endif
 
         atomic_flag_clear_explicit(&lock->flag, memory_order_release);
+#endif
+
         preemption_enable();
 }
 
-#endif
-
-/** Lock spinlock conditionally
- *
+/**
  * Lock spinlock conditionally. If the spinlock is not available
  * at the moment, signal failure.
@@ -140 +144 @@
  * @param lock Pointer to spinlock_t structure.
  *
- * @return Zero on failure, non-zero otherwise.
+ * @return true on success.
  *
  */
@@ -146 +150 @@
 {
         preemption_disable();
+
+#ifdef CONFIG_SMP
         bool ret = !atomic_flag_test_and_set_explicit(&lock->flag, memory_order_acquire);
 
@@ -152 +158 @@
 
         return ret;
+#else
+        return true;
+#endif
 }
 
@@ -161 +170 @@
 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.
@@ -170 +180 @@
                 atomic_flag_clear_explicit(&lock->flag, memory_order_relaxed);
         return ret;
+#else
+        return true;
+#endif
 }
-
-#endif
 
 /** @}