michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: add __ASSERT() for thread priorities

Browse source 
Verify the thread priorities are within the bounds when starting a new
thread and when changing the priority of a thread.

Change-Id: I007b3b249e4b80235b6439cbee44cad2f31973bb
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-11-08 15:44:05 -05:00 • committed by Benjamin Walsh
commit 3cc2ba9f9c
6 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/core/thread.c
View file

@ -91,6 +91,8 @@ void _new_thread(char *pStackMem, unsigned stackSize,
void *parameter1, void *parameter2, void *parameter3,
int priority, unsigned options)
{
_ASSERT_VALID_PRIO(priority, pEntry);
char *stackEnd = pStackMem + stackSize;
struct init_stack_frame *pInitCtx;

2
arch/arm/core/thread.c
View file

@ -87,6 +87,8 @@ void _new_thread(char *pStackMem, unsigned stackSize,
void *parameter1, void *parameter2, void *parameter3,
int priority, unsigned options)
{
_ASSERT_VALID_PRIO(priority, pEntry);
__ASSERT(!((uint32_t)pStackMem & (STACK_ALIGN - 1)),
"stack is not aligned properly\n"
"%d-byte alignment required\n", STACK_ALIGN);

2
arch/nios2/core/thread.c
View file

@ -68,6 +68,8 @@ void _new_thread(char *stack_memory, unsigned stack_size,
void *arg1, void *arg2, void *arg3,
int priority, unsigned options)
{
_ASSERT_VALID_PRIO(priority, thread_func);
struct tcs *tcs;
struct init_stack_frame *iframe;

2
arch/x86/core/thread.c
View file

@ -259,6 +259,8 @@ void _new_thread(char *pStackMem, unsigned stackSize,
void *parameter1, void *parameter2, void *parameter3,
int priority, unsigned options)
{
_ASSERT_VALID_PRIO(priority, pEntry);
unsigned long *pInitialThread;
#ifdef CONFIG_INIT_STACKS

18
kernel/unified/include/ksched.h
View file

@ -36,6 +36,24 @@ extern void _move_thread_to_end_of_prio_q(struct k_thread *thread);
extern struct k_thread *_get_next_ready_thread(void);
extern int __must_switch_threads(void);
extern int32_t _ms_to_ticks(int32_t ms);
extern void idle(void *, void *, void *);
static inline int _is_idle_thread(void *entry_point)
{
return entry_point == idle;
}
#define _ASSERT_VALID_PRIO(prio, entry_point) do { \
__ASSERT(((prio) == K_IDLE_PRIO && _is_idle_thread(entry_point)) || \
(_is_prio_higher_or_equal((prio), \
K_LOWEST_APPLICATION_THREAD_PRIO) && \
_is_prio_lower_or_equal((prio), \
K_HIGHEST_APPLICATION_THREAD_PRIO)), \
"invalid priority (%d); allowed range: %d to %d", \
(prio), \
K_LOWEST_APPLICATION_THREAD_PRIO, \
K_HIGHEST_APPLICATION_THREAD_PRIO); \
} while ((0))
/*
* The _is_prio_higher family: I created this because higher priorities are

5
kernel/unified/sched.c
View file

@ -222,6 +222,11 @@ int k_thread_priority_get(k_tid_t thread)
void k_thread_priority_set(k_tid_t tid, int prio)
{
/*
* Use NULL, since we cannot know what the entry point is (we do not
* keep track of it) and idle cannot change its priority.
*/
_ASSERT_VALID_PRIO(prio, NULL);
__ASSERT(!_is_in_isr(), "");
struct k_thread *thread = (struct k_thread *)tid;