Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sched/irq: Fix a infinite recursion problem that a recent change introduced into the i.MX6 SMP implementation.

Browse Source
This commit is contained in:
Gregory Nutt
2018-02-06 09:17:28 -06:00
parent fb50c44d08
commit 0ba7853016
2 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/irq/irq_csection.c
+17 -6
View File
@@ -123,7 +123,7 @@ volatile uint8_t g_cpu_nestcount[CONFIG_SMP_NCPUS];
static inline bool irq_waitlock(int cpu)
{
#ifdef CONFIG_SCHED_INSTRUMENTATION_SPINLOCKS
FAR struct tcb_s *tcb = this_task();
FAR struct tcb_s *tcb = current_task(cpu);
/* Notify that we are waiting for a spinlock */
@@ -309,11 +309,16 @@ try_again:
else
{
/* Normal tasking environment. */
/* Do we already have interrupts disabled? */
/* Get the TCB of the currently executing task on this CPU (avoid
* using this_task() which can recurse.
*/
rtcb = this_task();
cpu = this_cpu();
rtcb = current_task(cpu);
DEBUGASSERT(rtcb != NULL);
/* Do we already have interrupts disabled? */
if (rtcb->irqcount > 0)
{
/* Yes... make sure that the spinlock is set and increment the
@@ -463,7 +468,7 @@ void leave_critical_section(irqstate_t flags)
DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
g_cpu_nestcount[cpu] == 1);
FAR struct tcb_s *rtcb = this_task();
FAR struct tcb_s *rtcb = current_task(cpu);
DEBUGASSERT(rtcb != NULL);
if (rtcb->irqcount <= 0)
@@ -477,7 +482,14 @@ void leave_critical_section(irqstate_t flags)
}
else
{
FAR struct tcb_s *rtcb = this_task();
FAR struct tcb_s *rtcb;
/* Get the TCB of the currently executing task on this CPU (avoid
* using this_task() which can recurse.
*/
cpu = this_cpu();
rtcb = current_task(cpu);
DEBUGASSERT(rtcb != NULL && rtcb->irqcount > 0);
/* Normal tasking context. We need to coordinate with other
@@ -505,7 +517,6 @@ void leave_critical_section(irqstate_t flags)
* released, then unlock the spinlock.
*/
cpu = this_cpu();
DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
(g_cpu_irqset & (1 << cpu)) != 0);