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

Merge branch 'fix/freertos_delete_with_caps_smp_race_v5.5' into 'release/v5.5'

Browse Source 
fix(freertos): close vTaskDeleteWithCaps cross-core delete race on SMP preview kernel (v5.5)

See merge request espressif/esp-idf!48601
This commit is contained in:
Jiang Jiang Jian
2026-06-03 10:29:20 +08:00
parent a4119dc2b8 609ef78371
commit aa137bacfd
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
components/freertos/esp_additions/idf_additions.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -92,14 +92,36 @@ err:
* So we suspend the task before deleting it. */
vTaskSuspend( xTaskToDelete );
/* Wait for the task to be suspended */
while( eRunning == eTaskGetState( xTaskToDelete ) )
/* Wait until the task is no longer the current task on any core.
*
* Polling on pxCurrentTCBs[] (via xTaskGetCurrentTaskHandleForCore())
* matches the predicate vTaskDelete() uses to choose between immediate
* and IDLE-deferred TCB cleanup. By waiting on it here, we guarantee
* that the vTaskDelete() call below takes the immediate path and that
* prvDeleteTCB() runs synchronously before vTaskDelete() returns, so
* the heap_caps_free() / vPortFree() that follow cannot race with the
* IDLE task. */
for( ;; )
{
BaseType_t xStillOnCore = pdFALSE;
for( BaseType_t xCoreID = 0; xCoreID < configNUMBER_OF_CORES; xCoreID++ )
{
if( xTaskGetCurrentTaskHandleForCore( xCoreID ) == xTaskToDelete )
{
xStillOnCore = pdTRUE;
break;
}
}
if( xStillOnCore == pdFALSE )
{
break;
}
taskYIELD();
}
configASSERT( eRunning != eTaskGetState( xTaskToDelete ) );
/* We can delete the task and free the memory buffers.
* First, we must call `vTaskDelete` so that the port task delete callback is called.
* On targets that have coprocessors, it may be possible that the stack pointer is modified (restored)