espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(esp_system): TaskWDT can now use frame pointer to print the backtrace

Browse Source
This commit is contained in:
Omar Chebib
2024-10-15 19:11:51 +08:00
parent 1e0cdcbd13
commit ead2c8655e
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_system/port/arch/riscv/debug_helpers.c
View File

@@ -17,12 +17,14 @@
#if CONFIG_ESP_SYSTEM_USE_EH_FRAME #if CONFIG_ESP_SYSTEM_USE_EH_FRAME
#include "esp_private/eh_frame_parser.h" #include "esp_private/eh_frame_parser.h"
#endif // CONFIG_ESP_SYSTEM_USE_EH_FRAME
#if !CONFIG_ESP_SYSTEM_USE_EH_FRAME #elif CONFIG_ESP_SYSTEM_USE_FRAME_POINTER
extern void esp_fp_print_backtrace(const void*);
#else // !CONFIG_ESP_SYSTEM_USE_EH_FRAME && !
/* Function used to print all the registers pointed by the given frame .*/ /* Function used to print all the registers pointed by the given frame .*/
extern void panic_print_registers(const void *frame, int core); extern void panic_print_registers(const void *frame, int core);
#endif // !CONFIG_ESP_SYSTEM_USE_EH_FRAME #endif // CONFIG_ESP_SYSTEM_USE_EH_FRAME
/* Targets based on a RISC-V CPU cannot perform backtracing that easily. /* Targets based on a RISC-V CPU cannot perform backtracing that easily.
* We have two options here: * We have two options here:
@@ -54,10 +56,10 @@ esp_err_t IRAM_ATTR esp_backtrace_print(int depth)
memcpy(&backtrace_frame, frame, sizeof(esp_cpu_frame_t)); memcpy(&backtrace_frame, frame, sizeof(esp_cpu_frame_t));
#if CONFIG_ESP_SYSTEM_USE_EH_FRAME #if CONFIG_ESP_SYSTEM_USE_EH_FRAME
esp_rom_printf("esp_backtrace_print: Print CPU %d (current core) backtrace\n", current_core);
esp_eh_frame_print_backtrace(frame); esp_eh_frame_print_backtrace(frame);
#elif CONFIG_ESP_SYSTEM_USE_FRAME_POINTER
esp_fp_print_backtrace(frame);
#else // CONFIG_ESP_SYSTEM_USE_EH_FRAME #else // CONFIG_ESP_SYSTEM_USE_EH_FRAME
esp_rom_printf("esp_backtrace_print: Print CPU %d (current core) registers\n", current_core);
panic_prepare_frame_from_ctx(&backtrace_frame); panic_prepare_frame_from_ctx(&backtrace_frame);
panic_print_registers(&backtrace_frame, current_core); panic_print_registers(&backtrace_frame, current_core);

26
components/esp_system/task_wdt/task_wdt.c
View File

@@ -29,14 +29,12 @@
#include "riscv/rvruntime-frames.h" #include "riscv/rvruntime-frames.h"
#endif //CONFIG_IDF_TARGET_ARCH_RISCV #endif //CONFIG_IDF_TARGET_ARCH_RISCV
#if CONFIG_ESP_SYSTEM_USE_EH_FRAME #if CONFIG_ESP_SYSTEM_NO_BACKTRACE
#include "esp_private/eh_frame_parser.h" /* If the target doesn't support backtrace, we will show CPU registers*/
#endif // CONFIG_ESP_SYSTEM_USE_EH_FRAME #define BACKTRACE_MSG "registers"
#else // !CONFIG_ESP_SYSTEM_NO_BACKTRACE
#if CONFIG_IDF_TARGET_ARCH_RISCV && !CONFIG_ESP_SYSTEM_USE_EH_FRAME #define BACKTRACE_MSG "backtrace"
/* Function used to print all the registers pointed by the given frame .*/ #endif
extern void panic_print_registers(const void *frame, int core);
#endif // CONFIG_IDF_TARGET_ARCH_RISCV && !CONFIG_ESP_SYSTEM_USE_EH_FRAME
/* We will use this function in order to simulate an `abort()` occurring in /* We will use this function in order to simulate an `abort()` occurring in
* a different context than the one it's called from. */ * a different context than the one it's called from. */
@@ -390,13 +388,11 @@ void task_wdt_timeout_abort(bool current_core)
g_twdt_isr = true; g_twdt_isr = true;
void *frame = (void *) snapshot.pxTopOfStack; void *frame = (void *) snapshot.pxTopOfStack;
#if CONFIG_ESP_SYSTEM_USE_EH_FRAME | CONFIG_IDF_TARGET_ARCH_XTENSA
if (current_core) { if (current_core) {
ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) backtrace", xPortGetCoreID()); ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) " BACKTRACE_MSG, xPortGetCoreID());
} else { } else {
ESP_EARLY_LOGE(TAG, "Print CPU %d backtrace", xPortGetCoreID()); ESP_EARLY_LOGE(TAG, "Print CPU %d " BACKTRACE_MSG, xPortGetCoreID());
} }
#endif
xt_unhandled_exception(frame); xt_unhandled_exception(frame);
} }
@@ -412,7 +408,7 @@ static void task_wdt_timeout_handling(int cores_fail, bool panic)
if ((cores_fail & BIT(0)) && (cores_fail & BIT(1))) { if ((cores_fail & BIT(0)) && (cores_fail & BIT(1))) {
/* In the case where both CPUs have failing tasks, print the current CPU backtrace and then let the /* In the case where both CPUs have failing tasks, print the current CPU backtrace and then let the
* other core fail. */ * other core fail. */
ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) backtrace", current_core); ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) " BACKTRACE_MSG, current_core);
esp_backtrace_print(100); esp_backtrace_print(100);
/* TODO: the interrupt we send should have the highest priority */ /* TODO: the interrupt we send should have the highest priority */
esp_crosscore_int_send_twdt_abort(other_core); esp_crosscore_int_send_twdt_abort(other_core);
@@ -430,13 +426,13 @@ static void task_wdt_timeout_handling(int cores_fail, bool panic)
} else { } else {
/* Print backtrace of the core that failed to reset the watchdog */ /* Print backtrace of the core that failed to reset the watchdog */
if (cores_fail & BIT(current_core)) { if (cores_fail & BIT(current_core)) {
ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) backtrace", current_core); ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) " BACKTRACE_MSG, current_core);
esp_backtrace_print(100); esp_backtrace_print(100);
} }
#if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE #if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
const int other_core = !current_core; const int other_core = !current_core;
if (cores_fail & BIT(other_core)) { if (cores_fail & BIT(other_core)) {
ESP_EARLY_LOGE(TAG, "Print CPU %d backtrace", other_core); ESP_EARLY_LOGE(TAG, "Print CPU %d " BACKTRACE_MSG, other_core);
esp_crosscore_int_send_print_backtrace(other_core); esp_crosscore_int_send_print_backtrace(other_core);
} }
#endif // !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE #endif // !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE