This is an automated email from the ASF dual-hosted git repository.

GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 9a996a3ae13650edfa6ae53d26bff9debf418b36
Author: zhangyu117 <[email protected]>
AuthorDate: Fri Sep 4 14:04:19 2026 +0800

    libc/atomic: add spinlock fallback for missing widths
    
    arch_atomic.c generates compiler atomic interfaces for widths provided
    by ARCH, IRQ and HWSPINLOCK backends.
    
    arch_atomic_spinlock.c supplements missing 1/2/8-byte widths for ARCH
    and provides out-of-line compiler fallbacks for TOOLCHAIN, using a
    notrace IRQ-safe spinlock. Keep 4-byte operations out of this fallback
    to avoid recursive dependencies with spinlock itself.
    
    Signed-off-by: zhangyu117 <[email protected]>
---
 include/nuttx/atomic.h                             |  64 +++++++++++
 include/nuttx/lib/arch_atomic.h                    |  61 +++++------
 libs/libc/machine/CMakeLists.txt                   |   6 +-
 libs/libc/machine/Make.defs                        |   6 +-
 libs/libc/machine/arch_atomic.c                    |   5 +-
 .../{arch_atomic.c => arch_atomic_spinlock.c}      | 119 ++++++++++++++-------
 6 files changed, 185 insertions(+), 76 deletions(-)

diff --git a/include/nuttx/atomic.h b/include/nuttx/atomic.h
index 6477340f3c3..a9471bc4c71 100644
--- a/include/nuttx/atomic.h
+++ b/include/nuttx/atomic.h
@@ -277,6 +277,40 @@
 
 #endif /* UINTPTR_MAX > UINT32_MAX */
 
+#define ARCH_ATOMIC_DECLARE(prefix, t, n)                              \
+  void prefix ## _store_ ## n(FAR volatile void *ptr, t value,         \
+                              int memorder);                           \
+  t prefix ## _load_ ## n(FAR const volatile void *ptr, int memorder); \
+  t prefix ## _exchange_ ## n(FAR volatile void *ptr, t value,         \
+                              int memorder);                           \
+  bool prefix ## _compare_exchange_ ## n(                              \
+      FAR volatile void *ptr, FAR volatile void *expect, t desired,    \
+      bool weak, int success, int failure);                            \
+  t prefix ## _flags_test_and_set_ ## n(FAR volatile void *ptr,        \
+                                        int memorder);                 \
+  t prefix ## _fetch_add_ ## n(FAR volatile void *ptr, t value,        \
+                               int memorder);                          \
+  t prefix ## _fetch_sub_ ## n(FAR volatile void *ptr, t value,        \
+                               int memorder);                          \
+  t prefix ## _fetch_and_ ## n(FAR volatile void *ptr, t value,        \
+                               int memorder);                          \
+  t prefix ## _fetch_or_ ## n(FAR volatile void *ptr, t value,         \
+                              int memorder);                           \
+  t prefix ## _fetch_xor_ ## n(FAR volatile void *ptr, t value,        \
+                               int memorder);
+
+#define ARCH_SYNC_DECLARE(prefix, t, n)                                \
+  t prefix ## _add_and_fetch_ ## n(FAR volatile void *ptr, t value);   \
+  t prefix ## _sub_and_fetch_ ## n(FAR volatile void *ptr, t value);   \
+  t prefix ## _or_and_fetch_ ## n(FAR volatile void *ptr, t value);    \
+  t prefix ## _and_and_fetch_ ## n(FAR volatile void *ptr, t value);   \
+  t prefix ## _xor_and_fetch_ ## n(FAR volatile void *ptr, t value);   \
+  t prefix ## _nand_and_fetch_ ## n(FAR volatile void *ptr, t value);  \
+  bool prefix ## _bool_compare_and_swap_ ## n(                         \
+      FAR volatile void *ptr, t oldvalue, t newvalue);                 \
+  t prefix ## _val_compare_and_swap_ ## n(                             \
+      FAR volatile void *ptr, t oldvalue, t newvalue);
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -290,4 +324,34 @@ typedef atomic64_t atomic_ptr_t;
 typedef atomic_t atomic_ptr_t;
 #endif
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+#ifdef CONFIG_LIBC_ATOMIC_ARCH
+#  ifndef ARCH_HAVE_ATOMIC_1
+ARCH_ATOMIC_DECLARE(atomic, uint8_t, 1)
+ARCH_SYNC_DECLARE(sync, uint8_t, 1)
+#  endif
+
+#  ifndef ARCH_HAVE_ATOMIC_2
+ARCH_ATOMIC_DECLARE(atomic, uint16_t, 2)
+ARCH_SYNC_DECLARE(sync, uint16_t, 2)
+#  endif
+
+#  ifndef ARCH_HAVE_ATOMIC_8
+ARCH_ATOMIC_DECLARE(atomic, int64_t, 8)
+ARCH_SYNC_DECLARE(sync, uint64_t, 8)
+#  endif
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* __INCLUDE_NUTTX_ATOMIC_H */
diff --git a/include/nuttx/lib/arch_atomic.h b/include/nuttx/lib/arch_atomic.h
index c579ee40029..1368e8840cc 100644
--- a/include/nuttx/lib/arch_atomic.h
+++ b/include/nuttx/lib/arch_atomic.h
@@ -49,39 +49,33 @@
 #endif
 
 #if !defined(CONFIG_BUILD_FLAT) && !defined(__KERNEL__)
-static inline irqstate_t atomic_lock(void)
-{
-  sched_lock();
-  return 0;
-}
-
-static inline void atomic_unlock(irqstate_t flags)
-{
-  sched_unlock();
-}
+#  define atomic_lock() (sched_lock(), (irqstate_t)0)
+#  define atomic_unlock(flags) ((void)(flags), sched_unlock())
 #elif defined(CONFIG_LIBC_ATOMIC_HWSPINLOCK)
 extern struct hwspinlock_dev_s g_atomic_hwspinlock;
-static inline irqstate_t atomic_lock(void)
-{
-  return hwspin_lock_irqsave(&g_atomic_hwspinlock);
-}
-
-static inline void atomic_unlock(irqstate_t flags)
-{
-  hwspin_unlock_restore(&g_atomic_hwspinlock, flags);
-}
+#  define atomic_lock() \
+     hwspin_lock_irqsave(&g_atomic_hwspinlock)
+#  define atomic_unlock(flags) \
+     hwspin_unlock_restore(&g_atomic_hwspinlock, flags)
 #else
-static inline irqstate_t atomic_lock(void)
-{
-  return up_irq_save();
-}
-
-static inline void atomic_unlock(irqstate_t flags)
-{
-  up_irq_restore(flags);
-}
+#  define atomic_lock() up_irq_save()
+#  define atomic_unlock(flags) up_irq_restore(flags)
 #endif
 
+#undef ARCH_ATOMIC_STORE
+#undef ARCH_ATOMIC_LOAD
+#undef ARCH_ATOMIC_EXCHANGE
+#undef ARCH_ATOMIC_COMPARE_EXCHANGE
+#undef ARCH_ATOMIC_FLAGS_TEST_AND_SET
+#undef ARCH_ATOMIC_FETCH_OP
+#undef ARCH_ATOMIC_DEFINE
+#undef ARCH_SYNC_OP_FETCH
+#undef ARCH_SYNC_NAND_FETCH
+#undef ARCH_SYNC_BOOL_CMP_SWAP
+#undef ARCH_SYNC_VAL_CMP_SWAP
+#undef ARCH_SYNC_SYNCHRONIZE
+#undef ARCH_SYNC_DEFINE
+
 #define ARCH_ATOMIC_STORE(func, t)                                       \
   ARCH_ATOMIC_SPECIFIER                                                  \
   void func(FAR volatile void *ptr, t value, int memorder)               \
@@ -271,10 +265,12 @@ static inline void atomic_unlock(irqstate_t flags)
   ARCH_SYNC_BOOL_CMP_SWAP(prefix ## _bool_compare_and_swap_ ## n, t)     \
   ARCH_SYNC_VAL_CMP_SWAP(prefix ## _val_compare_and_swap_ ## n, t)
 
-#define ARCH_HAVE_ATOMIC_1
-#define ARCH_HAVE_ATOMIC_2
-#define ARCH_HAVE_ATOMIC_4
-#define ARCH_HAVE_ATOMIC_8
+#if defined(CONFIG_LIBC_ATOMIC_HWSPINLOCK) || \
+    defined(CONFIG_LIBC_ATOMIC_IRQ)
+#  define ARCH_HAVE_ATOMIC_1
+#  define ARCH_HAVE_ATOMIC_2
+#  define ARCH_HAVE_ATOMIC_4
+#  define ARCH_HAVE_ATOMIC_8
 
 /****************************************************************************
  * Inline Functions
@@ -289,5 +285,6 @@ ARCH_SYNC_DEFINE(sync, uint8_t, 1)
 ARCH_SYNC_DEFINE(sync, uint16_t, 2)
 ARCH_SYNC_DEFINE(sync, uint32_t, 4)
 ARCH_SYNC_DEFINE(sync, uint64_t, 8)
+#endif
 
 #endif /* __INCLUDE_NUTTX_LIB_ARCH_ATOMIC_H */
diff --git a/libs/libc/machine/CMakeLists.txt b/libs/libc/machine/CMakeLists.txt
index 1c9542380a0..6e0b698b1fc 100644
--- a/libs/libc/machine/CMakeLists.txt
+++ b/libs/libc/machine/CMakeLists.txt
@@ -22,8 +22,10 @@
 
 add_subdirectory(${CONFIG_ARCH})
 
-if(NOT CONFIG_LIBC_ATOMIC_TOOLCHAIN)
-  target_sources(c PRIVATE arch_atomic.c)
+target_sources(c PRIVATE arch_atomic.c)
+
+if(NOT CONFIG_LIBC_ATOMIC_IRQ AND NOT CONFIG_LIBC_ATOMIC_HWSPINLOCK)
+  target_sources(c PRIVATE arch_atomic_spinlock.c)
 endif()
 
 if(CONFIG_MM_KASAN)
diff --git a/libs/libc/machine/Make.defs b/libs/libc/machine/Make.defs
index af1a0636b56..6da3930a51a 100644
--- a/libs/libc/machine/Make.defs
+++ b/libs/libc/machine/Make.defs
@@ -20,8 +20,10 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_LIBC_ATOMIC_TOOLCHAIN),y)
-  CSRCS += arch_atomic.c
+CSRCS += arch_atomic.c
+
+ifeq ($(CONFIG_LIBC_ATOMIC_IRQ)$(CONFIG_LIBC_ATOMIC_HWSPINLOCK),)
+  CSRCS += arch_atomic_spinlock.c
 endif
 
 ifeq ($(CONFIG_MM_KASAN),y)
diff --git a/libs/libc/machine/arch_atomic.c b/libs/libc/machine/arch_atomic.c
index 9eed7d6a6df..21580de4863 100644
--- a/libs/libc/machine/arch_atomic.c
+++ b/libs/libc/machine/arch_atomic.c
@@ -26,10 +26,11 @@
 
 #include <nuttx/config.h>
 
-#define ARCH_ATOMIC_SPECIFIER
-
 #include <nuttx/atomic.h>
 
+#undef ARCH_ATOMIC_SPECIFIER
+#define ARCH_ATOMIC_SPECIFIER weak_function
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/libs/libc/machine/arch_atomic.c 
b/libs/libc/machine/arch_atomic_spinlock.c
similarity index 52%
copy from libs/libc/machine/arch_atomic.c
copy to libs/libc/machine/arch_atomic_spinlock.c
index 9eed7d6a6df..bbc0c525b15 100644
--- a/libs/libc/machine/arch_atomic.c
+++ b/libs/libc/machine/arch_atomic_spinlock.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arch_atomic.c
+ * libs/libc/machine/arch_atomic_spinlock.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -26,62 +26,105 @@
 
 #include <nuttx/config.h>
 
-#define ARCH_ATOMIC_SPECIFIER
+#include <sched.h>
 
-#include <nuttx/atomic.h>
+#include <nuttx/spinlock.h>
+#include <nuttx/lib/arch_atomic.h>
 
 /****************************************************************************
- * Public Functions
+ * Pre-processor Definitions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: __atomic_*_{1,2,4,8}
- ****************************************************************************/
+#undef ARCH_ATOMIC_SPECIFIER
+#define ARCH_ATOMIC_SPECIFIER weak_function
 
-#ifdef ARCH_HAVE_ATOMIC_1
-ARCH_ATOMIC_DEFINE(__atomic, uint8_t, 1)
-#endif
-#ifdef ARCH_HAVE_ATOMIC_2
-ARCH_ATOMIC_DEFINE(__atomic, uint16_t, 2)
-#endif
-#ifdef ARCH_HAVE_ATOMIC_4
-ARCH_ATOMIC_DEFINE(__atomic, uint32_t, 4)
+#undef atomic_lock
+#undef atomic_unlock
+
+#if !defined(CONFIG_BUILD_FLAT) && !defined(__KERNEL__)
+#  define atomic_lock() \
+     atomic_lock_sched()
+#  define atomic_unlock(flags) \
+     atomic_unlock_sched(flags)
+#else
+#  define atomic_lock() \
+     spin_lock_irqsave_notrace(&g_atomic_spinlock)
+#  define atomic_unlock(flags) \
+     spin_unlock_irqrestore_notrace(&g_atomic_spinlock, flags)
 #endif
-#ifdef ARCH_HAVE_ATOMIC_8
-ARCH_ATOMIC_DEFINE(__atomic, uint64_t, 8)
+
+#ifdef CONFIG_LIBC_ATOMIC_ARCH
+#  define ARCH_ATOMIC_NOPREFIX_DEFINE  ARCH_ATOMIC_DEFINE
+#  define ARCH_SYNC_NOPREFIX_DEFINE    ARCH_SYNC_DEFINE
+#else
+#  define ARCH_ATOMIC_NOPREFIX_DEFINE(prefix, t, n)
+#  define ARCH_SYNC_NOPREFIX_DEFINE(prefix, t, n)
 #endif
 
-/* Clang define the __sync builtins, add #ifndef to avoid
- * redefined/redeclared problem.
- */
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
 
-#ifndef __clang__
+#if !defined(ARCH_HAVE_ATOMIC_1) || !defined(ARCH_HAVE_ATOMIC_2) || \
+    !defined(ARCH_HAVE_ATOMIC_8)
+static spinlock_t g_atomic_spinlock = SP_UNLOCKED;
 
 /****************************************************************************
- * Name: __sync_*_{1,2,4,8}
+ * Private Functions
  ****************************************************************************/
 
-#ifdef ARCH_SYNC_DEFINE
-#  ifdef ARCH_HAVE_ATOMIC_1
-ARCH_SYNC_DEFINE(__sync, uint8_t, 1)
-#  endif
-#  ifdef ARCH_HAVE_ATOMIC_2
-ARCH_SYNC_DEFINE(__sync, uint16_t, 2)
-#  endif
-#  ifdef ARCH_HAVE_ATOMIC_4
-ARCH_SYNC_DEFINE(__sync, uint32_t, 4)
-#  endif
-#  ifdef ARCH_HAVE_ATOMIC_8
-ARCH_SYNC_DEFINE(__sync, uint64_t, 8)
+#  if !defined(CONFIG_BUILD_FLAT) && !defined(__KERNEL__)
+
+/* User code cannot disable the interrupts. Lock the scheduler instead. */
+
+static inline irqstate_t atomic_lock_sched(void)
+{
+  sched_lock();
+  while (!spin_trylock_notrace(&g_atomic_spinlock));
+
+  return 0;
+}
+
+static inline void atomic_unlock_sched(irqstate_t flags)
+{
+  spin_unlock_notrace(&g_atomic_spinlock);
+  sched_unlock();
+}
 #  endif
 #endif
 
 /****************************************************************************
- * Name: __sync_synchronize
+ * Public Functions
  ****************************************************************************/
 
-#ifdef ARCH_SYNC_SYNCHRONIZE
-ARCH_SYNC_SYNCHRONIZE(__sync)
+#ifndef ARCH_HAVE_ATOMIC_1
+ARCH_ATOMIC_NOPREFIX_DEFINE(atomic, uint8_t, 1)
+ARCH_ATOMIC_DEFINE(__atomic, uint8_t, 1)
+#endif
+
+#ifndef ARCH_HAVE_ATOMIC_2
+ARCH_ATOMIC_NOPREFIX_DEFINE(atomic, uint16_t, 2)
+ARCH_ATOMIC_DEFINE(__atomic, uint16_t, 2)
+#endif
+
+#ifndef ARCH_HAVE_ATOMIC_8
+ARCH_ATOMIC_NOPREFIX_DEFINE(atomic, int64_t, 8)
+ARCH_ATOMIC_DEFINE(__atomic, uint64_t, 8)
 #endif
 
-#endif /* __clang__ */
+#ifndef __clang__
+#  ifdef ARCH_SYNC_DEFINE
+#    ifndef ARCH_HAVE_ATOMIC_1
+ARCH_SYNC_NOPREFIX_DEFINE(sync, uint8_t, 1)
+ARCH_SYNC_DEFINE(__sync, uint8_t, 1)
+#    endif
+#    ifndef ARCH_HAVE_ATOMIC_2
+ARCH_SYNC_NOPREFIX_DEFINE(sync, uint16_t, 2)
+ARCH_SYNC_DEFINE(__sync, uint16_t, 2)
+#    endif
+#    ifndef ARCH_HAVE_ATOMIC_8
+ARCH_SYNC_NOPREFIX_DEFINE(sync, uint64_t, 8)
+ARCH_SYNC_DEFINE(__sync, uint64_t, 8)
+#    endif
+#  endif
+#endif

Reply via email to