kernel/sched: Panic on aborting essential threads
Documentation specifies that aborting/terminating/exiting essential threads is a system panic condition, but we didn't actually implement that and allowed it as for other threads. At least one app wants to exploit this documented behavior as a "watchdog" kind of condition, and that seems reasonable. Do what we say we're supposed to do. This also includes a small fix to a test, which seemed like it was written to exercise exactly this condition. Except that it failed to detect whether or not a system fatal error was actually signaled and was (incorrectly) indicating "success". Check that we actually enter the handler. Fixes #45545 Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
parent
843a24924f
commit
fb613594c7
2 changed files with 14 additions and 0 deletions
|
@ -1712,6 +1712,13 @@ void z_thread_abort(struct k_thread *thread)
|
|||
{
|
||||
k_spinlock_key_t key = k_spin_lock(&sched_spinlock);
|
||||
|
||||
if ((thread->base.user_options & K_ESSENTIAL) != 0) {
|
||||
k_spin_unlock(&sched_spinlock, key);
|
||||
__ASSERT(false, "aborting essential thread %p", thread);
|
||||
k_panic();
|
||||
return;
|
||||
}
|
||||
|
||||
if ((thread->base.thread_state & _THREAD_DEAD) != 0U) {
|
||||
k_spin_unlock(&sched_spinlock, key);
|
||||
return;
|
||||
|
|
|
@ -14,6 +14,8 @@ struct k_thread kthread_thread;
|
|||
K_THREAD_STACK_DEFINE(kthread_stack, STACKSIZE);
|
||||
K_SEM_DEFINE(sync_sem, 0, 1);
|
||||
|
||||
static bool fatal_error_signaled;
|
||||
|
||||
static void thread_entry(void *p1, void *p2, void *p3)
|
||||
{
|
||||
z_thread_essential_set();
|
||||
|
@ -55,6 +57,8 @@ void k_sys_fatal_error_handler(unsigned int reason,
|
|||
ARG_UNUSED(esf);
|
||||
ARG_UNUSED(reason);
|
||||
|
||||
fatal_error_signaled = true;
|
||||
|
||||
z_thread_essential_clear();
|
||||
}
|
||||
|
||||
|
@ -85,6 +89,8 @@ static void abort_thread_entry(void *p1, void *p2, void *p3)
|
|||
|
||||
void test_essential_thread_abort(void)
|
||||
{
|
||||
fatal_error_signaled = false;
|
||||
|
||||
k_tid_t tid = k_thread_create(&kthread_thread, kthread_stack, STACKSIZE,
|
||||
(k_thread_entry_t)abort_thread_entry,
|
||||
NULL, NULL, NULL, K_PRIO_PREEMPT(0), 0,
|
||||
|
@ -93,4 +99,5 @@ void test_essential_thread_abort(void)
|
|||
k_sem_take(&sync_sem, K_FOREVER);
|
||||
k_thread_abort(tid);
|
||||
|
||||
zassert_true(fatal_error_signaled, "fatal error was not signaled");
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue