Skip to content

avoid deadlock (rt_hw_interrupt_disable and rt_enter_critical when en… #3786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 1 commit into from
Jul 29, 2020
Merged

avoid deadlock (rt_hw_interrupt_disable and rt_enter_critical when en… #3786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/scheduler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
#include <rtthread.h>
#include <rthw.h>

#ifdef RT_USING_SMP
rt_hw_spinlock_t _rt_critical_lock;
#endif /*RT_USING_SMP*/

rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX];
rt_uint32_t rt_thread_ready_priority_group;
#if RT_THREAD_PRIORITY_MAX > 32
Expand Down Expand Up @@ -851,20 +847,23 @@ void rt_enter_critical(void)
if (!current_thread)
{
rt_hw_local_irq_enable(level);
return ;
return;
}

/*
* the maximal number of nest is RT_UINT16_MAX, which is big
* enough and does not check here
*/

/* lock scheduler for all cpus */
if (current_thread->critical_lock_nest == 0)
{
rt_hw_spin_lock(&_rt_critical_lock);
register rt_uint16_t lock_nest = current_thread->cpus_lock_nest;
current_thread->cpus_lock_nest++;
if (lock_nest == 0)
{
current_thread->scheduler_lock_nest ++;
rt_hw_spin_lock(&_cpus_lock);
}
}

/* critical for local cpu */
current_thread->critical_lock_nest ++;

Expand Down Expand Up @@ -910,16 +909,18 @@ void rt_exit_critical(void)
if (!current_thread)
{
rt_hw_local_irq_enable(level);
return ;
return;
}

current_thread->scheduler_lock_nest --;

current_thread->critical_lock_nest --;

if (current_thread->critical_lock_nest == 0)
current_thread->cpus_lock_nest--;
if (current_thread->cpus_lock_nest == 0)
{
rt_hw_spin_unlock(&_rt_critical_lock);
current_thread->scheduler_lock_nest --;
rt_hw_spin_unlock(&_cpus_lock);
}

if (current_thread->scheduler_lock_nest <= 0)
Expand Down