diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/clock.c | 2 | ||||
| -rw-r--r-- | src/cpu.c | 1 | ||||
| -rw-r--r-- | src/irq.c | 9 | ||||
| -rw-r--r-- | src/scheduler_mp.c | 14 | ||||
| -rw-r--r-- | src/timer.c | 2 |
5 files changed, 25 insertions, 3 deletions
diff --git a/src/clock.c b/src/clock.c index a5f5d5e9f1..88f443ee0e 100644 --- a/src/clock.c +++ b/src/clock.c @@ -89,6 +89,8 @@ void rt_tick_increase(void) rt_base_t level; rt_atomic_t oldval = 0; + RT_ASSERT(rt_interrupt_get_nest() > 0); + RT_OBJECT_HOOK_CALL(rt_tick_hook, ()); /* increase the global tick */ #ifdef RT_USING_SMP @@ -136,6 +136,7 @@ RTM_EXPORT(rt_spin_unlock_irqrestore) */ struct rt_cpu *rt_cpu_self(void) { + RT_ASSERT(!rt_scheduler_is_available()); return &_cpus[rt_hw_cpu_id()]; } @@ -13,6 +13,7 @@ * 2022-01-07 Gabriel Moving __on_rt_xxxxx_hook to irq.c * 2022-07-04 Yunjie fix RT_DEBUG_LOG * 2023-09-15 xqyjlj perf rt_hw_interrupt_disable/enable + * 2024-01-05 Shell Fixup of data racing in rt_interrupt_get_nest */ #include <rthw.h> @@ -114,7 +115,13 @@ RTM_EXPORT(rt_interrupt_leave); */ rt_weak rt_uint8_t rt_interrupt_get_nest(void) { - return rt_atomic_load(&rt_interrupt_nest); + rt_uint8_t ret; + rt_base_t level; + + level = rt_hw_local_irq_disable(); + ret = rt_atomic_load(&rt_interrupt_nest); + rt_hw_local_irq_enable(level); + return ret; } RTM_EXPORT(rt_interrupt_get_nest); diff --git a/src/scheduler_mp.c b/src/scheduler_mp.c index 06193c388e..fdd148b1ca 100644 --- a/src/scheduler_mp.c +++ b/src/scheduler_mp.c @@ -31,6 +31,7 @@ * 2023-03-27 rose_man Split into scheduler upc and scheduler_mp.c * 2023-09-15 xqyjlj perf rt_hw_interrupt_disable/enable * 2023-12-10 xqyjlj use rt_hw_spinlock + * 2024-01-05 Shell Fixup of data racing in rt_critical_level */ #include <rtthread.h> @@ -848,8 +849,17 @@ RTM_EXPORT(rt_exit_critical); */ rt_uint16_t rt_critical_level(void) { - struct rt_thread *current_thread = rt_cpu_self()->current_thread; - return rt_atomic_load(&(current_thread->critical_lock_nest)); + rt_base_t level; + rt_uint16_t critical_lvl; + struct rt_thread *current_thread; + + level = rt_hw_local_irq_disable(); + + current_thread = rt_cpu_self()->current_thread; + critical_lvl = rt_atomic_load(&(current_thread->critical_lock_nest)); + + rt_hw_local_irq_enable(level); + return critical_lvl; } RTM_EXPORT(rt_critical_level); diff --git a/src/timer.c b/src/timer.c index 2f1ad9c718..3520b5cde5 100644 --- a/src/timer.c +++ b/src/timer.c @@ -658,6 +658,8 @@ void rt_timer_check(void) rt_base_t level; rt_list_t list; + RT_ASSERT(rt_interrupt_get_nest() > 0); + #ifdef RT_USING_SMP if (rt_hw_cpu_id() != 0) { |