bt_buf: use small lock to protect bt_bufferlist_s

reason: We would like to replace the big lock with a small lock. Signed-off-by: hujun5 <[email protected]>
W-M-R · Dec 18, 2024 · bc6bf01 · bc6bf01
1 parent 658e4ff
commit bc6bf01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/include/nuttx/wireless/bluetooth/bt_buf.h b/include/nuttx/wireless/bluetooth/bt_buf.h
@@ -43,6 +43,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <nuttx/spinlock.h>
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -114,6 +116,7 @@ struct bt_bufferlist_s
 {
   FAR struct bt_buf_s *head;
   FAR struct bt_buf_s *tail;
+  spinlock_t lock;
 };
 
 /****************************************************************************

diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c
@@ -139,15 +139,15 @@ static void bt_enqueue_bufwork(FAR struct bt_bufferlist_s *list,
 {
   irqstate_t flags;
 
-  flags      = spin_lock_irqsave(NULL);
+  flags      = spin_lock_irqsave(&list->lock);
   buf->flink = list->head;
   if (list->head == NULL)
     {
       list->tail = buf;
     }
 
   list->head = buf;
-  spin_unlock_irqrestore(NULL, flags);
+  spin_unlock_irqrestore(&list->lock, flags);
 }
 
 /****************************************************************************
@@ -172,7 +172,7 @@ static FAR struct bt_buf_s *
   FAR struct bt_buf_s *buf;
   irqstate_t flags;
 
-  flags = spin_lock_irqsave(NULL);
+  flags = spin_lock_irqsave(&list->lock);
   buf   = list->tail;
   if (buf != NULL)
     {
@@ -201,7 +201,7 @@ static FAR struct bt_buf_s *
       buf->flink = NULL;
     }
 
-  spin_unlock_irqrestore(NULL, flags);
+  spin_unlock_irqrestore(&list->lock, flags);
   return buf;
 }
 
@@ -1653,6 +1653,9 @@ int bt_initialize(void)
   memset(&g_lp_rxlist, 0, sizeof(g_lp_rxlist));
   memset(&g_hp_rxlist, 0, sizeof(g_hp_rxlist));
 
+  spin_lock_init(&g_hp_rxlist.lock);
+  spin_lock_init(&g_lp_rxlist.lock);
+
   DEBUGASSERT(btdev != NULL);
   bt_buf_initialize();