This is an automated email from the ASF dual-hosted git repository.
xiaoxiang 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 c5757ed71f sched/timedwait: Ensure critical section for nxsig_timeout
c5757ed71f is described below
commit c5757ed71f0a2e79771695b3e2ea9c2a459e9dc6
Author: Serg Podtynnyi <s...@podtynnyi.com>
AuthorDate: Wed May 14 22:52:10 2025 +0700
sched/timedwait: Ensure critical section for nxsig_timeout
nxsig_timeout calls nxsched_add_readytorun and up_switch_context, so
must be in critical section.
nxsig_timeout is used as wdentry in nxsig_clockwait
See wd_expiration CALL_FUNC is not in critical section.
Signed-off-by: Serg Podtynnyi <s...@podtynnyi.com>
---
sched/signal/sig_timedwait.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/sched/signal/sig_timedwait.c b/sched/signal/sig_timedwait.c
index d396f5577c..4a0ce54ab7 100644
--- a/sched/signal/sig_timedwait.c
+++ b/sched/signal/sig_timedwait.c
@@ -78,20 +78,14 @@
static void nxsig_timeout(wdparm_t arg)
{
FAR struct tcb_s *wtcb = (FAR struct tcb_s *)(uintptr_t)arg;
-#ifdef CONFIG_SMP
+
irqstate_t flags;
/* We must be in a critical section in order to call up_switch_context()
- * below. If we are running on a single CPU architecture, then we know
- * interrupts a disabled an there is no need to explicitly call
- * enter_critical_section(). However, in the SMP case,
- * enter_critical_section() does much more than just disable interrupts on
- * the local CPU; it also manages spinlocks to assure the stability of the
- * TCB that we are manipulating.
+ * below.
*/
flags = enter_critical_section();
-#endif
/* There may be a race condition -- make sure the task is
* still waiting for a signal
@@ -127,9 +121,7 @@ static void nxsig_timeout(wdparm_t arg)
}
}
-#ifdef CONFIG_SMP
leave_critical_section(flags);
-#endif
}
/****************************************************************************
@@ -252,8 +244,8 @@ int nxsig_clockwait(int clockid, int flags,
FAR const struct timespec *rqtp,
FAR struct timespec *rmtp)
{
- FAR struct tcb_s *rtcb = this_task();
- irqstate_t iflags;
+ FAR struct tcb_s *rtcb;
+ irqstate_t iflags;
clock_t expect = 0;
clock_t stop;
@@ -297,6 +289,7 @@ int nxsig_clockwait(int clockid, int flags,
#endif
iflags = enter_critical_section();
+ rtcb = this_task();
if (rqtp)
{
@@ -394,7 +387,7 @@ int nxsig_clockwait(int clockid, int flags,
int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info,
FAR const struct timespec *timeout)
{
- FAR struct tcb_s *rtcb = this_task();
+ FAR struct tcb_s *rtcb;
sigset_t intersection;
FAR sigpendq_t *sigpend;
irqstate_t flags;
@@ -410,6 +403,7 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct
siginfo *info,
*/
flags = enter_critical_section();
+ rtcb = this_task();
/* Check if there is a pending signal corresponding to one of the
* signals in the pending signal set argument.
