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

Merge branch 'bugfix/panic_instr_fetch_prohibited' into 'master'

Browse Source 
panic: don't interrupt the backtrace for InstrFetchProhibited exceptions

See merge request espressif/esp-idf!9851
This commit is contained in:
Ivan Grokhotkov
2020-08-07 21:43:35 +08:00
parent 64f2ac49ce 4e7e8598f3
commit 7acda7b8eb
6 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_system/port/panic_handler.c
View File

@@ -156,7 +156,9 @@ static void print_backtrace(const void *f, int core)
//Check if first frame is valid
bool corrupted = !(esp_stack_ptr_is_sane(stk_frame.sp) &&
esp_ptr_executable((void *)esp_cpu_process_stack_pc(stk_frame.pc)));
(esp_ptr_executable((void *)esp_cpu_process_stack_pc(stk_frame.pc)) ||
/* Ignore the first corrupted PC in case of InstrFetchProhibited */
frame->exccause == EXCCAUSE_INSTR_PROHIBITED));
uint32_t i = ((depth <= 0) ? INT32_MAX : depth) - 1; //Account for stack frame that's already printed
while (i-- > 0 && stk_frame.next_pc != 0 && !corrupted) {
@@ -456,7 +458,7 @@ static void frame_to_panic_info(XtExcFrame *frame, panic_info_t *info, bool pseu
info->description = "Exception was unhandled.";
if (info->reason == reason[0]) {
if (frame->exccause == EXCCAUSE_ILLEGAL) {
info->details = print_illegal_instruction_details;
}
}

4
components/freertos/Kconfig
View File

@@ -174,8 +174,8 @@ menu "FreeRTOS"
config FREERTOS_ISR_STACKSIZE
int "ISR stack size"
range 2100 32768 if ESP32_COREDUMP_DATA_FORMAT_ELF
default 2100 if ESP32_COREDUMP_DATA_FORMAT_ELF
range 2096 32768 if ESP32_COREDUMP_DATA_FORMAT_ELF
default 2096 if ESP32_COREDUMP_DATA_FORMAT_ELF
range 1536 32768
default 1536
help

12
components/freertos/xtensa/include/freertos/FreeRTOSConfig.h
View File

@@ -196,10 +196,16 @@ int xt_clock_freq(void) __attribute__((deprecated));
#define configIDLE_TASK_STACK_SIZE CONFIG_FREERTOS_IDLE_TASK_STACKSIZE
#endif
/* The Xtensa port uses a separate interrupt stack. Adjust the stack size */
/* to suit the needs of your specific application. */
/* Stack alignment, architecture specifc. Must be a power of two. */
#define configSTACK_ALIGNMENT 16
/* The Xtensa port uses a separate interrupt stack. Adjust the stack size
* to suit the needs of your specific application.
* Size needs to be aligned to the stack increment, since the location of
* the stack for the 2nd CPU will be calculated using configISR_STACK_SIZE.
*/
#ifndef configISR_STACK_SIZE
#define configISR_STACK_SIZE CONFIG_FREERTOS_ISR_STACKSIZE
#define configISR_STACK_SIZE ((CONFIG_FREERTOS_ISR_STACKSIZE + configSTACK_ALIGNMENT - 1) & (~(configSTACK_ALIGNMENT - 1)))
#endif
/* Minimal heap size to make sure examples can run on memory limited

3
tools/test_apps/system/panic/app_test.py
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env python
import sys
import panic_tests as test
from test_panic_util.test_panic_util import panic_test, run_all
@@ -247,4 +248,4 @@ def test_coredump_abort_flash_bin_crc(env, extra_data):
if __name__ == '__main__':
run_all(__file__)
run_all(__file__, sys.argv[1:])

43
tools/test_apps/system/panic/panic_tests.py
View File

@@ -19,9 +19,9 @@ def task_wdt_inner(env, test_name):
dut.expect("CPU 0: main")
dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0"))
dut.expect_none("register dump:")
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -29,12 +29,12 @@ def int_wdt_inner(env, test_name):
with get_dut(env, test_name, "test_int_wdt", qemu_wdt_enable=True) as dut:
dut.expect_gme("Interrupt wdt timeout on CPU0")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_backtrace()
dut.expect_none("Guru Meditation")
dut.expect_reg_dump(1)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -44,11 +44,11 @@ def int_wdt_cache_disabled_inner(env, test_name):
dut.expect_gme("Interrupt wdt timeout on CPU0")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
dut.expect_reg_dump(1)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -57,18 +57,18 @@ def cache_error_inner(env, test_name):
dut.expect("Re-enable cpu cache.")
dut.expect_gme("Cache disabled but cached memory region accessed")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
def abort_inner(env, test_name):
with get_dut(env, test_name, "test_abort") as dut:
dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0"))
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation", "Re-entered core dump")
dut.expect_none("Guru Meditation", "Re-entered core dump")
test_common(dut, test_name)
@@ -76,9 +76,9 @@ def storeprohibited_inner(env, test_name):
with get_dut(env, test_name, "test_storeprohibited") as dut:
dut.expect_gme("StoreProhibited")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -87,9 +87,9 @@ def stack_overflow_inner(env, test_name):
dut.expect_gme("Unhandled debug exception")
dut.expect("Stack canary watchpoint triggered (main)")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -97,9 +97,9 @@ def illegal_instruction_inner(env, test_name):
with get_dut(env, test_name, "test_illegal_instruction") as dut:
dut.expect_gme("IllegalInstruction")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("CORRUPTED", "Guru Meditation")
dut.expect_none("Guru Meditation")
test_common(dut, test_name)
@@ -107,10 +107,7 @@ def instr_fetch_prohibited_inner(env, test_name):
with get_dut(env, test_name, "test_instr_fetch_prohibited") as dut:
dut.expect_gme("InstrFetchProhibited")
dut.expect_reg_dump(0)
dut.expect("Backtrace:")
# At the moment the backtrace is corrupted, need to jump over the first PC in case of InstrFetchProhibited.
# Fix this and change expect to expect_none.
dut.expect("CORRUPTED")
dut.expect_backtrace()
dut.expect_elf_sha256()
dut.expect_none("Guru Meditation")
test_common(dut, test_name)

13
tools/test_apps/system/panic/test_panic_util/test_panic_util.py
View File

@@ -76,6 +76,10 @@ class PanicTestMixin(object):
elf_sha256_len = int(sdkconfig.get("CONFIG_APP_RETRIEVE_LEN_ELF_SHA", "16"))
self.expect("ELF file SHA256: " + elf_sha256[0:elf_sha256_len])
def expect_backtrace(self):
self.expect("Backtrace:")
self.expect_none("CORRUPTED")
def __enter__(self):
self._raw_data = None
return self
@@ -155,14 +159,19 @@ def get_dut(env, app_config_name, test_name, qemu_wdt_enable=False):
return dut
def run_all(filename):
""" Helper function to run all test cases defined in a file; to be called from __main__. """
def run_all(filename, case_filter=[]):
""" Helper function to run test cases defined in a file; to be called from __main__.
case_filter is an optional list of case names to run.
If not specified, all test cases are run.
"""
TinyFW.set_default_config(env_config_file=None, test_suite_name=TEST_SUITE)
test_methods = SearchCases.Search.search_test_cases(filename)
test_methods = filter(lambda m: not m.case_info["ignore"], test_methods)
test_cases = CaseConfig.Parser.apply_config(test_methods, None)
tests_failed = []
for case in test_cases:
if case_filter and case.test_method.__name__ not in case_filter:
continue
result = case.run()
if not result:
tests_failed.append(case)