rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-16 02:23:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mutex: Use panic() after ISR lock release

Browse Source 
Using panic() with interrupts disabled could lead to an additional error
(INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT) due to a potentially
blocking output.
This commit is contained in:
Sebastian Huber
2018-03-12 14:38:46 +01:00
parent 2275776d21
commit eae664ea8f
3 changed files with 124 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtemsbsd/include/machine/rtems-bsd-muteximpl.h
View File

@@ -8,7 +8,7 @@
*/
/*
* Copyright (c) 2014, 2017 embedded brains GmbH. All rights reserved.
* Copyright (c) 2014, 2018 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -46,6 +46,9 @@
#include <sys/types.h>
#include <sys/lock.h>
#include <sys/systm.h>
#include <inttypes.h>
#include <rtems/score/threadimpl.h>
#include <rtems/score/threadqimpl.h>
@@ -160,7 +163,12 @@ rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m)
_Thread_Resource_count_increment(executing);
success = 1;
} else if (owner == executing) {
BSD_ASSERT(lock->lo_flags & LO_RECURSABLE);
if ((lock->lo_flags & LO_RECURSABLE) == 0) {
rtems_bsd_mutex_release(m, isr_level, &queue_context);
panic("mutex trylock: %s: not LO_RECURSABLE\n",
m->queue.Queue.name);
}
++m->nest_level;
success = 1;
} else {
@@ -178,6 +186,7 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
ISR_Level isr_level;
Thread_queue_Context queue_context;
Thread_Control *owner;
Thread_Control *executing;
int nest_level;
_Thread_queue_Context_initialize(&queue_context);
@@ -186,8 +195,14 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
nest_level = m->nest_level;
owner = m->queue.Queue.owner;
executing = _Thread_Executing;
BSD_ASSERT(owner == _Thread_Executing);
if (__predict_false(owner != executing)) {
rtems_bsd_mutex_release(m, isr_level, &queue_context);
panic("mutex unlock: %s: owner 0x%08" PRIx32
" != executing 0x%08" PRIx32 "\n", m->queue.Queue.name,
owner->Object.id, executing->Object.id);
}
if (__predict_true(nest_level == 0)) {
Thread_queue_Heads *heads;