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

Merge branch 'coredump_test_fixes_v6.1' into 'release/v6.1'

Browse Source 
Coredump fixes (v6.1)

See merge request espressif/esp-idf!50473
This commit is contained in:
Alexey Gerenkov
2026-08-27 16:00:22 +08:00
parent 88ef571889 b8fbf278c7
commit 67d7993822
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/espcoredump/src/core_dump_elf.c
+8 -8
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -497,8 +497,8 @@ static int elf_process_task_data(core_dump_elf_t *self)
core_dump_task_header_t task_hdr = { 0 }; core_dump_task_header_t task_hdr = { 0 };
core_dump_mem_seg_header_t interrupted_stack = { 0 }; core_dump_mem_seg_header_t interrupted_stack = { 0 };
TaskIterator_t task_iter; TaskIterator_t task_iter;
uint16_t tasks_num = 0; uint16_t written_task_num = 0;
uint16_t bad_tasks_num = 0; uint16_t __attribute__((unused)) bad_tasks_num = 0;
ESP_COREDUMP_LOG_PROCESS("================ Processing task data ================"); ESP_COREDUMP_LOG_PROCESS("================ Processing task data ================");
@@ -516,7 +516,7 @@ static int elf_process_task_data(core_dump_elf_t *self)
if (ret > 0) { if (ret > 0) {
elf_len += ret; elf_len += ret;
} }
tasks_num++; written_task_num++;
} }
esp_core_dump_task_iterator_init(&task_iter); esp_core_dump_task_iterator_init(&task_iter);
@@ -525,12 +525,11 @@ static int elf_process_task_data(core_dump_elf_t *self)
if (!task_iter.pxTaskHandle || task_iter.pxTaskHandle == current_task) { if (!task_iter.pxTaskHandle || task_iter.pxTaskHandle == current_task) {
continue; continue;
} }
if (tasks_num > CONFIG_ESP_COREDUMP_MAX_TASKS_NUM) { if (written_task_num > CONFIG_ESP_COREDUMP_MAX_TASKS_NUM) {
ESP_COREDUMP_LOG_PROCESS("Reached maximum number of tasks (%d), stopping task data processing", ESP_COREDUMP_LOG_PROCESS("Reached maximum number of tasks (%d), stopping task data processing",
CONFIG_ESP_COREDUMP_MAX_TASKS_NUM); CONFIG_ESP_COREDUMP_MAX_TASKS_NUM);
break; break;
} }
tasks_num++;
if (!esp_core_dump_get_task_snapshot(task_iter.pxTaskHandle, &task_hdr, NULL)) { if (!esp_core_dump_get_task_snapshot(task_iter.pxTaskHandle, &task_hdr, NULL)) {
bad_tasks_num++; bad_tasks_num++;
continue; continue;
@@ -539,8 +538,9 @@ static int elf_process_task_data(core_dump_elf_t *self)
ELF_CHECK_ERR((ret > 0), ret, ELF_CHECK_ERR((ret > 0), ret,
"Task %x, TCB write failed, return (%d).", task_iter.pxTaskHandle, ret); "Task %x, TCB write failed, return (%d).", task_iter.pxTaskHandle, ret);
elf_len += ret; elf_len += ret;
written_task_num++;
} }
ESP_COREDUMP_LOG_PROCESS("Found %d bad task out of %d", bad_tasks_num, tasks_num); ESP_COREDUMP_LOG_PROCESS("Found %d bad task out of %d", bad_tasks_num, bad_tasks_num + written_task_num);
return elf_len; return elf_len;
} }
@@ -797,7 +797,7 @@ esp_err_t esp_core_dump_write_elf(void)
core_dump_elf_t self = { 0 }; core_dump_elf_t self = { 0 };
core_dump_header_t dump_hdr = { 0 }; core_dump_header_t dump_hdr = { 0 };
int tot_len = sizeof(dump_hdr); int tot_len = sizeof(dump_hdr);
int write_len = sizeof(dump_hdr); int __attribute__((unused)) write_len = sizeof(dump_hdr);
esp_err_t err = esp_core_dump_write_init(); esp_err_t err = esp_core_dump_write_init();
if (err != ESP_OK) { if (err != ESP_OK) {
tools/test_apps/system/panic/coredump/pytest_panic_coredump.py
+4 -1
View File
@@ -62,7 +62,10 @@ CONFIG_COREDUMP_SUMMARY_FLASH_ENCRYPTED = panic_tests.configs_for_app(
COREDUMP_APP, ['coredump_flash_encrypted', 'coredump_flash_encrypted_coredump_plain'] COREDUMP_APP, ['coredump_flash_encrypted', 'coredump_flash_encrypted_coredump_plain']
) )
CONFIG_GDBSTUB_COREDUMP = panic_tests.configs_for_app(COREDUMP_APP, ['gdbstub_coredump']) CONFIG_GDBSTUB_COREDUMP = panic_tests.configs_for_app(COREDUMP_APP, ['gdbstub_coredump'])
CONFIG_TCB_CORRUPTED = panic_tests.configs_for_app(COREDUMP_APP, ['coredump_flash_default']) # Uses the dedicated coredump stack (CONFIG_ESP_COREDUMP_STACK_SIZE) on purpose: this test
# faults in idle-task context, whose small stack overflows the FreeRTOS end-of-stack watchpoint
# if the coredump runs in place, causing a double panic. Do not switch back to coredump_flash_default.
CONFIG_TCB_CORRUPTED = panic_tests.configs_for_app(COREDUMP_APP, ['coredump_flash_custom_stack'])
@pytest.mark.generic @pytest.mark.generic