Skip to content

Fix reporter wraparound and add bounds checks #4

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
jserv merged 1 commit into from
Mar 23, 2026
Merged

Fix reporter wraparound and add bounds checks #4

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
45 changes: 43 additions & 2 deletions ports/freertos/tm_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ int tm_thread_create(int thread_id, int priority, void (*entry_function)(void))
BaseType_t status;
UBaseType_t freertos_prio;

if (thread_id < 0 || thread_id >= TM_FREERTOS_MAX_THREADS || priority < 1 ||
priority > 31)
return TM_ERROR;

/* Invert priority: TM 1 (highest) -> configMAX_PRIORITIES-2,
* TM 31 (lowest) -> 0. Reserve configMAX_PRIORITIES-1 for ISR.
*/
Expand All @@ -189,6 +193,9 @@ int tm_thread_create(int thread_id, int priority, void (*entry_function)(void))

int tm_thread_resume(int thread_id)
{
if (thread_id < 0 || thread_id >= TM_FREERTOS_MAX_THREADS)
return TM_ERROR;

#if defined(__arm__) && !defined(TM_ISR_VIA_THREAD)
/* Cortex-M: detect ISR context for ISR-safe resume. */
if (xPortIsInsideInterrupt()) {
Expand All @@ -204,6 +211,9 @@ int tm_thread_resume(int thread_id)

int tm_thread_suspend(int thread_id)
{
if (thread_id < 0 || thread_id >= TM_FREERTOS_MAX_THREADS)
return TM_ERROR;

vTaskSuspend(tm_thread_array[thread_id]);
return TM_SUCCESS;
}
Expand All @@ -223,6 +233,9 @@ void tm_thread_sleep(int seconds)

int tm_queue_create(int queue_id)
{
if (queue_id < 0 || queue_id >= TM_FREERTOS_MAX_QUEUES)
return TM_ERROR;

tm_queue_array[queue_id] =
xQueueCreate(TM_FREERTOS_QUEUE_DEPTH, TM_FREERTOS_QUEUE_MSG_SIZE);

Expand All @@ -234,6 +247,9 @@ int tm_queue_create(int queue_id)

int tm_queue_send(int queue_id, unsigned long *message_ptr)
{
if (queue_id < 0 || queue_id >= TM_FREERTOS_MAX_QUEUES)
return TM_ERROR;

if (xQueueSendToBack(tm_queue_array[queue_id], (const void *) message_ptr,
0) != pdTRUE)
return TM_ERROR;
Expand All @@ -243,6 +259,9 @@ int tm_queue_send(int queue_id, unsigned long *message_ptr)

int tm_queue_receive(int queue_id, unsigned long *message_ptr)
{
if (queue_id < 0 || queue_id >= TM_FREERTOS_MAX_QUEUES)
return TM_ERROR;

if (xQueueReceive(tm_queue_array[queue_id], (void *) message_ptr, 0) !=
pdTRUE)
return TM_ERROR;
Expand All @@ -255,6 +274,9 @@ int tm_queue_receive(int queue_id, unsigned long *message_ptr)

int tm_semaphore_create(int semaphore_id)
{
if (semaphore_id < 0 || semaphore_id >= TM_FREERTOS_MAX_SEMAPHORES)
return TM_ERROR;

tm_semaphore_array[semaphore_id] = xSemaphoreCreateBinary();

if (tm_semaphore_array[semaphore_id] == NULL)
Expand All @@ -268,6 +290,9 @@ int tm_semaphore_create(int semaphore_id)

int tm_semaphore_get(int semaphore_id)
{
if (semaphore_id < 0 || semaphore_id >= TM_FREERTOS_MAX_SEMAPHORES)
return TM_ERROR;

if (xSemaphoreTake(tm_semaphore_array[semaphore_id], 0) != pdTRUE)
return TM_ERROR;

Expand All @@ -276,6 +301,9 @@ int tm_semaphore_get(int semaphore_id)

int tm_semaphore_put(int semaphore_id)
{
if (semaphore_id < 0 || semaphore_id >= TM_FREERTOS_MAX_SEMAPHORES)
return TM_ERROR;

#if defined(__arm__) && !defined(TM_ISR_VIA_THREAD)
if (xPortIsInsideInterrupt()) {
BaseType_t yield = pdFALSE;
Expand All @@ -298,7 +326,12 @@ int tm_semaphore_put(int semaphore_id)
int tm_memory_pool_create(int pool_id)
{
int i;
unsigned char *base = tm_pool_area[pool_id];
unsigned char *base;

if (pool_id < 0 || pool_id >= TM_FREERTOS_MAX_POOLS)
return TM_ERROR;

base = tm_pool_area[pool_id];

/* Build freelist: each block stores a next pointer. */
tm_pool_free[pool_id] = (void *) base;
Expand All @@ -318,7 +351,12 @@ int tm_memory_pool_create(int pool_id)

int tm_memory_pool_allocate(int pool_id, unsigned char **memory_ptr)
{
void *block = tm_pool_free[pool_id];
void *block;

if (pool_id < 0 || pool_id >= TM_FREERTOS_MAX_POOLS)
return TM_ERROR;

block = tm_pool_free[pool_id];

if (block == NULL)
return TM_ERROR;
Expand All @@ -332,6 +370,9 @@ int tm_memory_pool_allocate(int pool_id, unsigned char **memory_ptr)

int tm_memory_pool_deallocate(int pool_id, unsigned char *memory_ptr)
{
if (pool_id < 0 || pool_id >= TM_FREERTOS_MAX_POOLS)
return TM_ERROR;

/* Push onto freelist head. */
*((void **) memory_ptr) = tm_pool_free[pool_id];
tm_pool_free[pool_id] = (void *) memory_ptr;
Expand Down
26 changes: 26 additions & 0 deletions ports/threadx/tm_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ int tm_thread_create(int thread_id, int priority, void (*entry_function)(void))
{
UINT status;

if (thread_id < 0 || thread_id >= TM_THREADX_MAX_THREADS || priority < 1 ||
priority > 31)
return TM_ERROR;

/* Remember the actual thread entry. */
tm_thread_entry_functions[thread_id] = (void *) entry_function;

Expand All @@ -177,6 +181,8 @@ int tm_thread_resume(int thread_id)
{
UINT status;

if (thread_id < 0 || thread_id >= TM_THREADX_MAX_THREADS)
return TM_ERROR;

/* Attempt to resume the thread. */
status = tx_thread_resume(&tm_thread_array[thread_id]);
Expand All @@ -196,6 +202,8 @@ int tm_thread_suspend(int thread_id)
{
UINT status;

if (thread_id < 0 || thread_id >= TM_THREADX_MAX_THREADS)
return TM_ERROR;

/* Attempt to suspend the thread. */
status = tx_thread_suspend(&tm_thread_array[thread_id]);
Expand Down Expand Up @@ -236,6 +244,8 @@ int tm_queue_create(int queue_id)
{
UINT status;

if (queue_id < 0 || queue_id >= TM_THREADX_MAX_QUEUES)
return TM_ERROR;

/* Create the specified queue. Message size is computed from the
* actual width of unsigned long so LP64 and ILP32 both work.
Expand All @@ -262,6 +272,8 @@ int tm_queue_send(int queue_id, unsigned long *message_ptr)
{
UINT status;

if (queue_id < 0 || queue_id >= TM_THREADX_MAX_QUEUES)
return TM_ERROR;

/* Send the message to the specified queue. */
status = tx_queue_send(&tm_queue_array[queue_id], message_ptr, TX_NO_WAIT);
Expand All @@ -282,6 +294,8 @@ int tm_queue_receive(int queue_id, unsigned long *message_ptr)
{
UINT status;

if (queue_id < 0 || queue_id >= TM_THREADX_MAX_QUEUES)
return TM_ERROR;

/* Receive the message from the specified queue. */
status =
Expand All @@ -302,6 +316,8 @@ int tm_semaphore_create(int semaphore_id)
{
UINT status;

if (semaphore_id < 0 || semaphore_id >= TM_THREADX_MAX_SEMAPHORES)
return TM_ERROR;

/* Create semaphore. */
status = tx_semaphore_create(&tm_semaphore_array[semaphore_id],
Expand All @@ -322,6 +338,8 @@ int tm_semaphore_get(int semaphore_id)
{
UINT status;

if (semaphore_id < 0 || semaphore_id >= TM_THREADX_MAX_SEMAPHORES)
return TM_ERROR;

/* Get the semaphore. */
status = tx_semaphore_get(&tm_semaphore_array[semaphore_id], TX_NO_WAIT);
Expand All @@ -341,6 +359,8 @@ int tm_semaphore_put(int semaphore_id)
{
UINT status;

if (semaphore_id < 0 || semaphore_id >= TM_THREADX_MAX_SEMAPHORES)
return TM_ERROR;

/* Put the semaphore. */
status = tx_semaphore_put(&tm_semaphore_array[semaphore_id]);
Expand All @@ -361,6 +381,8 @@ int tm_memory_pool_create(int pool_id)
{
UINT status;

if (pool_id < 0 || pool_id >= TM_THREADX_MAX_MEMORY_POOLS)
return TM_ERROR;

/* Create the memory pool. */
status = tx_block_pool_create(
Expand All @@ -384,6 +406,8 @@ int tm_memory_pool_allocate(int pool_id, unsigned char **memory_ptr)
{
UINT status;

if (pool_id < 0 || pool_id >= TM_THREADX_MAX_MEMORY_POOLS)
return TM_ERROR;

/* Allocate a 128-byte block from the specified memory pool. */
status = tx_block_allocate(&tm_block_pool_array[pool_id],
Expand All @@ -405,6 +429,8 @@ int tm_memory_pool_deallocate(int pool_id, unsigned char *memory_ptr)
{
UINT status;

if (pool_id < 0 || pool_id >= TM_THREADX_MAX_MEMORY_POOLS)
return TM_ERROR;

/* Release the 128-byte block back to the specified memory pool. */
status = tx_block_release((void *) memory_ptr);
Expand Down
34 changes: 19 additions & 15 deletions src/cooperative_scheduling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ void tm_cooperative_thread_report(void)
unsigned long relative_time;
unsigned long last_total;
unsigned long average;
unsigned long c0, c1, c2, c3, c4;

/* Initialize the last total. */
last_total = 0;
Expand All @@ -164,26 +165,29 @@ void tm_cooperative_thread_report(void)
"Time: %lu\n",
relative_time);

/* Snapshot counters so the tolerance check uses values consistent with
* the total (workers keep incrementing).
*/
c0 = tm_cooperative_thread_0_counter;
c1 = tm_cooperative_thread_1_counter;
c2 = tm_cooperative_thread_2_counter;
c3 = tm_cooperative_thread_3_counter;
c4 = tm_cooperative_thread_4_counter;

/* Calculate the total of all the counters. */
total =
tm_cooperative_thread_0_counter + tm_cooperative_thread_1_counter +
tm_cooperative_thread_2_counter + tm_cooperative_thread_3_counter +
tm_cooperative_thread_4_counter;
total = c0 + c1 + c2 + c3 + c4;

/* Calculate the average of all the counters. */
average = total / 5;

/* See if there are any errors. */
if ((tm_cooperative_thread_0_counter < (average - 1)) ||
(tm_cooperative_thread_0_counter > (average + 1)) ||
(tm_cooperative_thread_1_counter < (average - 1)) ||
(tm_cooperative_thread_1_counter > (average + 1)) ||
(tm_cooperative_thread_2_counter < (average - 1)) ||
(tm_cooperative_thread_2_counter > (average + 1)) ||
(tm_cooperative_thread_3_counter < (average - 1)) ||
(tm_cooperative_thread_3_counter > (average + 1)) ||
(tm_cooperative_thread_4_counter < (average - 1)) ||
(tm_cooperative_thread_4_counter > (average + 1))) {
/* See if there are any errors. Skip when average is 0 to avoid unsigned
* wraparound on (average - 1).
*/
if (average > 0 && ((c0 < (average - 1)) || (c0 > (average + 1)) ||
(c1 < (average - 1)) || (c1 > (average + 1)) ||
(c2 < (average - 1)) || (c2 > (average + 1)) ||
(c3 < (average - 1)) || (c3 > (average + 1)) ||
(c4 < (average - 1)) || (c4 > (average + 1)))) {
tm_printf(
"ERROR: Invalid counter value(s). Cooperative counters should "
"not be more that 1 different than the average!\n");
Expand Down
29 changes: 15 additions & 14 deletions src/interrupt_preemption_processing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void tm_interrupt_preemption_thread_report(void)
unsigned long relative_time;
unsigned long last_total;
unsigned long average;

unsigned long c0, c1, ch;

/* Initialize the last total. */
last_total = 0;
Expand All @@ -151,32 +151,33 @@ void tm_interrupt_preemption_thread_report(void)
"Relative Time: %lu\n",
relative_time);

/* Snapshot counters for consistent total and tolerance check. */
c0 = tm_interrupt_preemption_thread_0_counter;
c1 = tm_interrupt_preemption_thread_1_counter;
ch = tm_interrupt_preemption_handler_counter;

/* Calculate the total of all the counters. */
total = tm_interrupt_preemption_thread_0_counter +
tm_interrupt_preemption_thread_1_counter +
tm_interrupt_preemption_handler_counter;
total = c0 + c1 + ch;

/* Calculate the average of all the counters. */
average = total / 3;

/* See if there are any errors. */
if ((tm_interrupt_preemption_thread_0_counter < (average - 1)) ||
(tm_interrupt_preemption_thread_0_counter > (average + 1)) ||
(tm_interrupt_preemption_thread_1_counter < (average - 1)) ||
(tm_interrupt_preemption_thread_1_counter > (average + 1)) ||
(tm_interrupt_preemption_handler_counter < (average - 1)) ||
(tm_interrupt_preemption_handler_counter > (average + 1))) {
/* See if there are any errors. Skip when average is 0 to avoid unsigned
* wraparound on (average - 1).
*/
if (average > 0 && ((c0 < (average - 1)) || (c0 > (average + 1)) ||
(c1 < (average - 1)) || (c1 > (average + 1)) ||
(ch < (average - 1)) || (ch > (average + 1)))) {
tm_printf(
"ERROR: Invalid counter value(s). Interrupt processing test "
"has failed!\n");
}

/* Show the total interrupts for the time period. */
tm_printf("Time Period Total: %lu\n\n",
tm_interrupt_preemption_handler_counter - last_total);
tm_printf("Time Period Total: %lu\n\n", ch - last_total);

/* Save the last total number of interrupts. */
last_total = tm_interrupt_preemption_handler_counter;
last_total = ch;
}

TM_REPORT_FINISH;
Expand Down
23 changes: 13 additions & 10 deletions src/interrupt_processing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void tm_interrupt_thread_report(void)
unsigned long last_total;
unsigned long relative_time;
unsigned long average;

unsigned long ct, ch;

/* Initialize the last total. */
last_total = 0;
Expand All @@ -152,28 +152,31 @@ void tm_interrupt_thread_report(void)
"%lu\n",
relative_time);

/* Snapshot counters for consistent total and tolerance check. */
ct = tm_interrupt_thread_0_counter;
ch = tm_interrupt_handler_counter;

/* Calculate the total of all the counters. */
total = tm_interrupt_thread_0_counter + tm_interrupt_handler_counter;
total = ct + ch;

/* Calculate the average of all the counters. */
average = total / 2;

/* See if there are any errors. */
if ((tm_interrupt_thread_0_counter < (average - 1)) ||
(tm_interrupt_thread_0_counter > (average + 1)) ||
(tm_interrupt_handler_counter < (average - 1)) ||
(tm_interrupt_handler_counter > (average + 1))) {
/* See if there are any errors. Skip when average is 0 to
* avoid unsigned wraparound on (average - 1).
*/
if (average > 0 && ((ct < (average - 1)) || (ct > (average + 1)) ||
(ch < (average - 1)) || (ch > (average + 1)))) {
tm_printf(
"ERROR: Invalid counter value(s). Interrupt processing test "
"has failed!\n");
}

/* Show the total interrupts for the time period. */
tm_printf("Time Period Total: %lu\n\n",
tm_interrupt_handler_counter - last_total);
tm_printf("Time Period Total: %lu\n\n", ch - last_total);

/* Save the last total number of interrupts. */
last_total = tm_interrupt_handler_counter;
last_total = ch;
}

TM_REPORT_FINISH;
Expand Down
Loading