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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2ae88a6ffe1 drivers/rc: using small spin lock to instead 
enter_critical_section
2ae88a6ffe1 is described below

commit 2ae88a6ffe1c6c260dd48d4dd18a77cb4b557c8e
Author: dongjiuzhu1 <[email protected]>
AuthorDate: Mon Jun 16 20:31:51 2025 +0800

    drivers/rc: using small spin lock to instead enter_critical_section
    
    Protect the open file list and the per-file circular buffers of the
    lirc upper half with a spinlock instead of the global critical section,
    and release the lock around the blocking wait in read.
    
    Signed-off-by: dongjiuzhu1 <[email protected]>
---
 drivers/rc/lirc_dev.c | 53 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
index 21a91418d9f..2f341da993e 100644
--- a/drivers/rc/lirc_dev.c
+++ b/drivers/rc/lirc_dev.c
@@ -41,6 +41,7 @@
 #include <nuttx/circbuf.h>
 #include <nuttx/poll.h>
 #include <nuttx/rc/lirc_dev.h>
+#include <nuttx/spinlock.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -60,6 +61,7 @@ struct lirc_upperhalf_s
   struct list_node             fh;           /* list of struct lirc_fh_s 
object */
   FAR struct lirc_lowerhalf_s *lower;        /* the handle of lower half 
driver */
   mutex_t                      lock;         /* Manages exclusive access to 
lowerhalf */
+  spinlock_t                   spinlock;     /* The protection spinlock for 
critical section */
   bool                         gap;          /* true if we're in a gap */
   uint64_t                     gap_start;    /* time when gap starts */
   uint64_t                     gap_duration; /* duration of initial gap */
@@ -171,9 +173,9 @@ static int lirc_open(FAR struct file *filep)
         }
     }
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&upper->spinlock);
   list_add_tail(&upper->fh, &fh->node);
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&upper->spinlock, flags);
 
   filep->f_priv = fh;
   return 0;
@@ -194,9 +196,9 @@ static int lirc_close(FAR struct file *filep)
   FAR struct lirc_lowerhalf_s *lower = fh->lower;
   irqstate_t flags;
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&upper->spinlock);
   list_delete(&fh->node);
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&upper->spinlock, flags);
 
   nxsem_destroy(&fh->waitsem);
   circbuf_uninit(&fh->buffer);
@@ -214,13 +216,15 @@ static int lirc_poll(FAR struct file *filep,
                      FAR struct pollfd_s *fds, bool setup)
 {
   FAR struct lirc_fh_s *fh = filep->f_priv;
+  FAR struct inode *inode  = filep->f_inode;
+  FAR struct lirc_upperhalf_s *upper = inode->i_private;
   pollevent_t eventset = 0;
-  irqstate_t flags;
   int ret = 0;
 
-  flags = enter_critical_section();
   if (setup)
     {
+      irqstate_t flags;
+
       if (fh->fds)
         {
           ret = -EBUSY;
@@ -230,11 +234,14 @@ static int lirc_poll(FAR struct file *filep,
       fh->fds = fds;
       fds->priv = &fh->fds;
 
+      flags = spin_lock_irqsave(&upper->spinlock);
       if (!circbuf_is_empty(&fh->buffer))
         {
           eventset |= POLLIN | POLLRDNORM;
         }
 
+      spin_unlock_irqrestore(&upper->spinlock, flags);
+
       poll_notify(&fds, 1, eventset);
     }
   else if (fds->priv != NULL)
@@ -252,7 +259,6 @@ static int lirc_poll(FAR struct file *filep,
     }
 
 errout:
-  leave_critical_section(flags);
   return ret;
 }
 
@@ -658,6 +664,8 @@ static ssize_t lirc_read_scancode(FAR struct file *filep, 
FAR char *buffer,
                                   size_t length)
 {
   FAR struct lirc_fh_s *fh = filep->f_priv;
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct lirc_upperhalf_s *upper = inode->i_private;
   irqstate_t flags;
   ssize_t ret;
 
@@ -667,7 +675,7 @@ static ssize_t lirc_read_scancode(FAR struct file *filep, 
FAR char *buffer,
       return -EINVAL;
     }
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&upper->spinlock);
   do
     {
       if (circbuf_is_empty(&fh->buffer))
@@ -678,7 +686,9 @@ static ssize_t lirc_read_scancode(FAR struct file *filep, 
FAR char *buffer,
               goto err;
             }
 
+          spin_unlock_irqrestore(&upper->spinlock, flags);
           ret = nxsem_wait_uninterruptible(&fh->waitsem);
+          flags = spin_lock_irqsave(&upper->spinlock);
           if (ret < 0)
             {
               goto err;
@@ -690,7 +700,7 @@ static ssize_t lirc_read_scancode(FAR struct file *filep, 
FAR char *buffer,
   while (ret <= 0);
 
 err:
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&upper->spinlock, flags);
   return ret;
 }
 
@@ -698,6 +708,8 @@ static ssize_t lirc_read_mode2(FAR struct file *filep, FAR 
char *buffer,
                                size_t length)
 {
   FAR struct lirc_fh_s *fh = filep->f_priv;
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct lirc_upperhalf_s *upper = inode->i_private;
   irqstate_t flags;
   ssize_t ret = 0;
 
@@ -706,7 +718,7 @@ static ssize_t lirc_read_mode2(FAR struct file *filep, FAR 
char *buffer,
       return -EINVAL;
     }
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&upper->spinlock);
   do
     {
       if (circbuf_is_empty(&fh->buffer))
@@ -717,7 +729,9 @@ static ssize_t lirc_read_mode2(FAR struct file *filep, FAR 
char *buffer,
               goto err;
             }
 
+          spin_unlock_irqrestore(&upper->spinlock, flags);
           ret = nxsem_wait_uninterruptible(&fh->waitsem);
+          flags = spin_lock_irqsave(&upper->spinlock);
           if (ret < 0)
             {
               goto err;
@@ -729,7 +743,7 @@ static ssize_t lirc_read_mode2(FAR struct file *filep, FAR 
char *buffer,
   while (ret <= 0);
 
 err:
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&upper->spinlock, flags);
   return ret;
 }
 
@@ -793,6 +807,7 @@ int lirc_register(FAR struct lirc_lowerhalf_s *lower, int 
devno)
   upper->lower = lower;
   list_initialize(&upper->fh);
   nxmutex_init(&upper->lock);
+  spin_lock_init(&upper->spinlock);
   lower->priv = upper;
 
   /* Register remote control character device */
@@ -913,7 +928,7 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower,
           upper->gap_duration = MIN(upper->gap_duration, LIRC_VALUE_MASK);
           gap = LIRC_SPACE(upper->gap_duration);
 
-          flags = enter_critical_section();
+          flags = spin_lock_irqsave_nopreempt(&upper->spinlock);
           list_for_every_safe(&upper->fh, node, tmp)
             {
               fh = (FAR struct lirc_fh_s *)node;
@@ -930,7 +945,7 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower,
               upper->gap = false;
             }
 
-          leave_critical_section(flags);
+          spin_unlock_irqrestore_nopreempt(&upper->spinlock, flags);
         }
 
       sample = ev.pulse ? LIRC_PULSE(ev.duration) : LIRC_SPACE(ev.duration);
@@ -938,7 +953,7 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower,
              ev.duration, ev.pulse ? 1 : 0);
     }
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave_nopreempt(&upper->spinlock);
   list_for_every_safe(&upper->fh, node, tmp)
     {
       fh = (FAR struct lirc_fh_s *)node;
@@ -958,7 +973,7 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower,
         }
     }
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore_nopreempt(&upper->spinlock, flags);
 }
 
 /****************************************************************************
@@ -987,7 +1002,7 @@ void lirc_scancode_event(FAR struct lirc_lowerhalf_s 
*lower,
 
   lsc->timestamp = lirc_get_timestamp();
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave_nopreempt(&upper->spinlock);
   list_for_every_safe(&upper->fh, node, tmp)
     {
       fh = (FAR struct lirc_fh_s *)node;
@@ -1002,7 +1017,7 @@ void lirc_scancode_event(FAR struct lirc_lowerhalf_s 
*lower,
         }
     }
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore_nopreempt(&upper->spinlock, flags);
 }
 
 /****************************************************************************
@@ -1033,7 +1048,7 @@ void lirc_sample_event(FAR struct lirc_lowerhalf_s *lower,
   irqstate_t flags;
   int semcount;
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave_nopreempt(&upper->spinlock);
   list_for_every_safe(&upper->fh, node, tmp)
     {
       fh = (FAR struct lirc_fh_s *)node;
@@ -1048,5 +1063,5 @@ void lirc_sample_event(FAR struct lirc_lowerhalf_s *lower,
         }
     }
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore_nopreempt(&upper->spinlock, flags);
 }

Reply via email to