spinlock: add sched_lock to spin_lock_irqsave

reason: We aim to replace big locks with smaller ones. So we will use spin_lock_irqsave extensively to replace enter_critical_section in the subsequent process. We imitate the implementation of Linux by adding sched_lock to spin_lock_irqsave in order to address scenarios where sem_post occurs within spin_lock_irqsave, which can lead to spinlock failures and deadlocks. Signed-off-by: hujun5 <[email protected]>
apache · Nov 26, 2024 · 178dc49 · 178dc49
1 parent ebea6e8
commit 178dc49
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
@@ -526,10 +526,17 @@ irqstate_t spin_lock_irqsave_wo_note(FAR volatile spinlock_t *lock)
       spin_lock_wo_note(lock);
     }
 
+  sched_lock_wo_note();
   return ret;
 }
 #else
-#  define spin_lock_irqsave_wo_note(l) ((void)(l), up_irq_save())
+static inline_function
+irqstate_t spin_lock_irqsave_wo_note(FAR volatile spinlock_t *lock)
+{
+  irqstate_t flags = up_irq_save();
+  sched_lock_wo_note();
+  return flags;
+}
 #endif
 
 /****************************************************************************
@@ -586,7 +593,13 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock)
   return flags;
 }
 #else
-#  define spin_lock_irqsave(l) ((void)(l), up_irq_save())
+static inline_function
+irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock)
+{
+  irqstate_t flags = up_irq_save();
+  sched_lock_wo_note();
+  return flags;
+}
 #endif
 
 /****************************************************************************
@@ -694,9 +707,10 @@ void spin_unlock_irqrestore_wo_note(FAR volatile spinlock_t *lock,
     }
 
   up_irq_restore(flags);
+  sched_unlock_wo_note();
 }
 #else
-#  define spin_unlock_irqrestore_wo_note(l, f) ((void)(l), up_irq_restore(f))
+#  define spin_unlock_irqrestore_wo_note(l, f) ((void)(l), up_irq_restore(f), sched_unlock_wo_note())
 #endif
 
 /****************************************************************************
@@ -742,7 +756,7 @@ void spin_unlock_irqrestore(FAR volatile spinlock_t *lock,
   sched_note_spinlock_unlock(lock);
 }
 #else
-#  define spin_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f))
+#  define spin_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f), sched_unlock_wo_note())
 #endif
 
 #if defined(CONFIG_RW_SPINLOCK)