Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_timer_task_dispatch_wedge_v6.1' into 'release/v6.1'

Browse Source 
fix(esp_timer): Fix esp_timer task dispatch stall (v6.1)

See merge request espressif/esp-idf!51610
This commit is contained in:
Marius Vikhammer
2026-08-31 15:52:24 +08:00
parent ae42d2cf67 2f8ef67a2d
commit 5967653bdd
4 changed files with 119 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_timer/src/esp_timer.c
+16 -21
View File
@@ -482,13 +482,11 @@ static ESP_TIMER_IRAM_ATTR void timer_list_unlock(esp_timer_dispatch_t timer_typ
}
#ifdef CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
static ESP_TIMER_IRAM_ATTR bool timer_process_alarm(esp_timer_dispatch_t dispatch_method)
#else
static bool timer_process_alarm(esp_timer_dispatch_t dispatch_method)
ESP_TIMER_IRAM_ATTR
#endif
static void timer_process_alarm(esp_timer_dispatch_t dispatch_method)
{
timer_list_lock(dispatch_method);
bool processed = false;
esp_timer_handle_t it;
while (1) {
it = LIST_FIRST(&s_timers[dispatch_method]);
@@ -498,7 +496,6 @@ static bool timer_process_alarm(esp_timer_dispatch_t dispatch_method)
break;
}
ESP_COMPILER_DIAGNOSTIC_POP("-Wanalyzer-use-after-free")
processed = true;
LIST_REMOVE(it, list_entry);
if (it->event_id == EVENT_ID_DELETE_TIMER) {
// It is handled only by ESP_TIMER_TASK (see esp_timer_delete()).
@@ -540,17 +537,9 @@ static bool timer_process_alarm(esp_timer_dispatch_t dispatch_method)
#endif
}
} // while(1)
if (it) {
if (dispatch_method == ESP_TIMER_TASK || (dispatch_method != ESP_TIMER_TASK && processed == true)) {
esp_timer_impl_set_alarm_id(it->alarm, dispatch_method);
}
} else {
if (processed) {
esp_timer_impl_set_alarm_id(UINT64_MAX, dispatch_method);
}
}
uint64_t next_alarm = (it != NULL) ? it->alarm : UINT64_MAX;
esp_timer_impl_set_alarm_id(next_alarm, dispatch_method);
timer_list_unlock(dispatch_method);
return processed;
}
static void timer_task(void* arg)
@@ -568,24 +557,30 @@ ESP_TIMER_IRAM_ATTR void esp_timer_isr_dispatch_need_yield(void)
assert(xPortInIsrContext());
s_isr_dispatch_need_yield = pdTRUE;
}
#endif
static void ESP_TIMER_IRAM_ATTR timer_alarm_handler(void* arg)
{
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
bool isr_timers_processed = false;
#ifdef CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
esp_timer_impl_try_to_set_next_alarm();
// process timers with ISR dispatch method
isr_timers_processed = timer_process_alarm(ESP_TIMER_ISR);
uint32_t due_alarm_mask = esp_timer_impl_claim_due_alarms();
if (due_alarm_mask & (1U << ESP_TIMER_ISR)) {
timer_process_alarm(ESP_TIMER_ISR);
}
xHigherPriorityTaskWoken = s_isr_dispatch_need_yield;
s_isr_dispatch_need_yield = pdFALSE;
#endif
if (isr_timers_processed == false) {
if (due_alarm_mask & (1U << ESP_TIMER_TASK)) {
vTaskNotifyGiveFromISR(s_timer_task, &xHigherPriorityTaskWoken);
}
#else
vTaskNotifyGiveFromISR(s_timer_task, &xHigherPriorityTaskWoken);
#endif
if (xHigherPriorityTaskWoken == pdTRUE) {
portYIELD_FROM_ISR();
}
components/esp_timer/src/esp_timer_impl_common.c
+18 -19
View File
@@ -38,29 +38,28 @@ void ESP_TIMER_IRAM_ATTR esp_timer_impl_set_alarm(uint64_t timestamp)
}
#ifdef CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
void ESP_TIMER_IRAM_ATTR esp_timer_impl_try_to_set_next_alarm(void)
/* Reprogram the hardware alarm to the nearest pending deadline,
* i.e. MIN(timestamp_id[0], timestamp_id[1]). The timestamp_id[] cache is not modified.
* Must be called with s_time_update_lock held. */
static inline void ESP_TIMER_IRAM_ATTR esp_timer_impl_rearm_alarm(void)
{
esp_timer_impl_set_alarm_id(timestamp_id[ESP_TIMER_TASK], ESP_TIMER_TASK);
}
uint32_t ESP_TIMER_IRAM_ATTR esp_timer_impl_claim_due_alarms(void)
{
portENTER_CRITICAL_ISR(&s_time_update_lock);
unsigned now_alarm_idx; // ISR is called due to this current alarm
unsigned next_alarm_idx; // The following alarm after now_alarm_idx
if (timestamp_id[0] < timestamp_id[1]) {
now_alarm_idx = 0;
next_alarm_idx = 1;
} else {
now_alarm_idx = 1;
next_alarm_idx = 0;
}
if (timestamp_id[next_alarm_idx] != UINT64_MAX) {
// The following alarm is valid and can be used.
// Remove the current alarm from consideration.
esp_timer_impl_set_alarm_id(UINT64_MAX, now_alarm_idx);
} else {
// There is no the following alarm.
// Remove the current alarm from consideration as well.
timestamp_id[now_alarm_idx] = UINT64_MAX;
uint64_t now = esp_timer_impl_get_time();
uint32_t due_mask = 0;
for (unsigned alarm_id = 0; alarm_id < sizeof(timestamp_id) / sizeof(timestamp_id[0]); ++alarm_id) {
if (timestamp_id[alarm_id] <= now) {
due_mask |= 1U << alarm_id;
timestamp_id[alarm_id] = UINT64_MAX;
}
}
esp_timer_impl_rearm_alarm();
portEXIT_CRITICAL_ISR(&s_time_update_lock);
return due_mask;
}
#endif