Skip to content

kernel/os: Fault Handling OS Coredump Callback Feature #2687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrahane merged 1 commit into from
Oct 18, 2021
Merged

kernel/os: Fault Handling OS Coredump Callback Feature #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kernel/os/include/os/arch/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ void os_set_env(os_stack_t *);
void os_arch_init_task_stack(os_stack_t *sf);
void os_default_irq_asm(void);
void os_assert_cb(void);
void os_coredump_cb(void *tf);

#ifdef __cplusplus
}
Expand Down
4 changes: 4 additions & 0 deletions kernel/os/include/os/os_fault.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ extern "C" {
void __assert_func(const char *file, int line, const char *func, const char *e)
__attribute((noreturn));

#if MYNEWT_VAL(OS_COREDUMP_CB)
typedef void (*coredump_cb_t)(void *tf);
#endif

#if MYNEWT_VAL(OS_CRASH_FILE_LINE)
#define OS_CRASH() (HAL_DEBUG_BREAK(), __assert_func(__FILE__, __LINE__, NULL, NULL))
#else
Expand Down
8 changes: 6 additions & 2 deletions kernel/os/src/arch/arc/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -154,7 +154,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
void
os_default_irq(struct trap_frame *tf)
{
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif

Expand All @@ -171,8 +171,12 @@ os_default_irq(struct trap_frame *tf)
tf->ef->r12, tf->ef->lr, tf->ef->pc, tf->ef->psr);

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif
hal_system_reset();
}
8 changes: 6 additions & 2 deletions kernel/os/src/arch/cortex_m0/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -129,7 +129,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
void
os_default_irq(struct trap_frame *tf)
{
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif
#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
Expand All @@ -151,9 +151,13 @@ os_default_irq(struct trap_frame *tf)

os_stacktrace((uintptr_t)(tf->ef + 1));
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif

#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
if ((SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) < 16) {
Expand Down
8 changes: 6 additions & 2 deletions kernel/os/src/arch/cortex_m3/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -142,7 +142,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
void
os_default_irq(struct trap_frame *tf)
{
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif
#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
Expand All @@ -166,9 +166,13 @@ os_default_irq(struct trap_frame *tf)

os_stacktrace((uintptr_t)(tf->ef + 1));
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif

#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
if (((SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) < 16) &&
Expand Down
8 changes: 6 additions & 2 deletions kernel/os/src/arch/cortex_m33/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -204,7 +204,7 @@ os_default_irq(struct trap_frame *tf)
#if MYNEWT_VAL(OS_CRASH_LOG)
struct log_reboot_info lri;
#endif
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif
#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
Expand Down Expand Up @@ -243,9 +243,13 @@ os_default_irq(struct trap_frame *tf)

#if MYNEWT_VAL(OS_COREDUMP)
hal_watchdog_tickle();
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif

#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
if (((SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) < 16) &&
Expand Down
8 changes: 6 additions & 2 deletions kernel/os/src/arch/cortex_m4/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -161,7 +161,7 @@ os_default_irq(struct trap_frame *tf)
#if MYNEWT_VAL(OS_CRASH_LOG)
struct log_reboot_info lri;
#endif
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif
#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
Expand Down Expand Up @@ -196,9 +196,13 @@ os_default_irq(struct trap_frame *tf)
#endif

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif

#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
if (((SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) < 16) &&
Expand Down
8 changes: 6 additions & 2 deletions kernel/os/src/arch/cortex_m7/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct coredump_regs {
uint32_t psr;
};

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
static void
trap_to_coredump(struct trap_frame *tf, struct coredump_regs *regs)
{
Expand Down Expand Up @@ -141,7 +141,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
void
os_default_irq(struct trap_frame *tf)
{
#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP) && !MYNEWT_VAL(OS_COREDUMP_CB)
struct coredump_regs regs;
#endif
#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
Expand All @@ -164,9 +164,13 @@ os_default_irq(struct trap_frame *tf)
console_printf("BFAR:0x%08lx MMFAR:0x%08lx\n", SCB->BFAR, SCB->MMFAR);

#if MYNEWT_VAL(OS_COREDUMP)
#if MYNEWT_VAL(OS_COREDUMP_CB)
os_coredump_cb(tf);
#else
trap_to_coredump(tf, &regs);
coredump_dump(&regs, sizeof(regs));
#endif
#endif

#if MYNEWT_VAL(OS_CRASH_RESTORE_REGS)
if (((SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) < 16) &&
Expand Down
5 changes: 5 additions & 0 deletions kernel/os/syscfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ syscfg.defs:
OS_COREDUMP:
description: 'Attempt to dump corefile when system crashes'
value: 0
OS_COREDUMP_CB:
description: 'Calls a custom OS coredump callback function'
value: 0
restriction:
- 'OS_COREDUMP if 1'
OS_CRASH_STACKTRACE:
description: 'Attempt to print stack trace when system crashes.'
value: 0
Expand Down