espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/freertos_smp_stack_tcb_allocation_order' into 'master'

Browse Source 
FreeRTOS: Fix stack and TCB allocation order

See merge request espressif/esp-idf!18841
This commit is contained in:
Darian
2022-07-06 03:22:52 +08:00
parent 5a3310ff3b a0ab1c2acd
commit ee808f55a4
2 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
View File

@@ -455,16 +455,21 @@ void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
StackType_t **ppxIdleTaskStackBuffer, StackType_t **ppxIdleTaskStackBuffer,
uint32_t *pulIdleTaskStackSize ) uint32_t *pulIdleTaskStackSize )
{ {
StaticTask_t *pxTCBBufferTemp;
StackType_t *pxStackBufferTemp; StackType_t *pxStackBufferTemp;
//Allocate TCB and stack buffer in internal memory StaticTask_t *pxTCBBufferTemp;
pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t)); /* Stack always grows downwards (from high address to low address) on all
* ESP RISC-V targets. Given that the heap allocator likely allocates memory
* from low to high address, we allocate the stack first and then the TCB so
* that the stack does not grow downwards into the TCB.
*
* Allocate TCB and stack buffer in internal memory. */
pxStackBufferTemp = pvPortMalloc(CONFIG_FREERTOS_IDLE_TASK_STACKSIZE); pxStackBufferTemp = pvPortMalloc(CONFIG_FREERTOS_IDLE_TASK_STACKSIZE);
assert(pxTCBBufferTemp != NULL); pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t));
assert(pxStackBufferTemp != NULL); assert(pxStackBufferTemp != NULL);
//Write back pointers assert(pxTCBBufferTemp != NULL);
*ppxIdleTaskTCBBuffer = pxTCBBufferTemp; // Write back pointers
*ppxIdleTaskStackBuffer = pxStackBufferTemp; *ppxIdleTaskStackBuffer = pxStackBufferTemp;
*ppxIdleTaskTCBBuffer = pxTCBBufferTemp;
*pulIdleTaskStackSize = CONFIG_FREERTOS_IDLE_TASK_STACKSIZE; *pulIdleTaskStackSize = CONFIG_FREERTOS_IDLE_TASK_STACKSIZE;
} }
@@ -472,16 +477,21 @@ void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
StackType_t **ppxTimerTaskStackBuffer, StackType_t **ppxTimerTaskStackBuffer,
uint32_t *pulTimerTaskStackSize ) uint32_t *pulTimerTaskStackSize )
{ {
StaticTask_t *pxTCBBufferTemp;
StackType_t *pxStackBufferTemp; StackType_t *pxStackBufferTemp;
//Allocate TCB and stack buffer in internal memory StaticTask_t *pxTCBBufferTemp;
pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t)); /* Stack always grows downwards (from high address to low address) on all
* ESP RISC-V targets. Given that the heap allocator likely allocates memory
* from low to high address, we allocate the stack first and then the TCB so
* that the stack does not grow downwards into the TCB.
*
* Allocate TCB and stack buffer in internal memory. */
pxStackBufferTemp = pvPortMalloc(configTIMER_TASK_STACK_DEPTH); pxStackBufferTemp = pvPortMalloc(configTIMER_TASK_STACK_DEPTH);
assert(pxTCBBufferTemp != NULL); pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t));
assert(pxStackBufferTemp != NULL); assert(pxStackBufferTemp != NULL);
//Write back pointers assert(pxTCBBufferTemp != NULL);
*ppxTimerTaskTCBBuffer = pxTCBBufferTemp; // Write back pointers
*ppxTimerTaskStackBuffer = pxStackBufferTemp; *ppxTimerTaskStackBuffer = pxStackBufferTemp;
*ppxTimerTaskTCBBuffer = pxTCBBufferTemp;
*pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH; *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
} }
#endif //( configSUPPORT_STATIC_ALLOCATION == 1 ) #endif //( configSUPPORT_STATIC_ALLOCATION == 1 )

32
components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
View File

@@ -508,16 +508,21 @@ void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
StackType_t **ppxIdleTaskStackBuffer, StackType_t **ppxIdleTaskStackBuffer,
uint32_t *pulIdleTaskStackSize ) uint32_t *pulIdleTaskStackSize )
{ {
StaticTask_t *pxTCBBufferTemp;
StackType_t *pxStackBufferTemp; StackType_t *pxStackBufferTemp;
//Allocate TCB and stack buffer in internal memory StaticTask_t *pxTCBBufferTemp;
pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t)); /* Stack always grows downwards (from high address to low address) on all
* ESP Xtensa targets. Given that the heap allocator likely allocates memory
* from low to high address, we allocate the stack first and then the TCB so
* that the stack does not grow downwards into the TCB.
*
* Allocate TCB and stack buffer in internal memory. */
pxStackBufferTemp = pvPortMalloc(CONFIG_FREERTOS_IDLE_TASK_STACKSIZE); pxStackBufferTemp = pvPortMalloc(CONFIG_FREERTOS_IDLE_TASK_STACKSIZE);
assert(pxTCBBufferTemp != NULL); pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t));
assert(pxStackBufferTemp != NULL); assert(pxStackBufferTemp != NULL);
//Write back pointers assert(pxTCBBufferTemp != NULL);
*ppxIdleTaskTCBBuffer = pxTCBBufferTemp; // Write back pointers
*ppxIdleTaskStackBuffer = pxStackBufferTemp; *ppxIdleTaskStackBuffer = pxStackBufferTemp;
*ppxIdleTaskTCBBuffer = pxTCBBufferTemp;
*pulIdleTaskStackSize = CONFIG_FREERTOS_IDLE_TASK_STACKSIZE; *pulIdleTaskStackSize = CONFIG_FREERTOS_IDLE_TASK_STACKSIZE;
} }
@@ -527,14 +532,19 @@ void vApplicationGetTimerTaskMemory(StaticTask_t **ppxTimerTaskTCBBuffer,
{ {
StaticTask_t *pxTCBBufferTemp; StaticTask_t *pxTCBBufferTemp;
StackType_t *pxStackBufferTemp; StackType_t *pxStackBufferTemp;
//Allocate TCB and stack buffer in internal memory /* Stack always grows downwards (from high address to low address) on all
pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t)); * ESP Xtensa targets. Given that the heap allocator likely allocates memory
* from low to high address, we allocate the stack first and then the TCB so
* that the stack does not grow downwards into the TCB.
*
* Allocate TCB and stack buffer in internal memory. */
pxStackBufferTemp = pvPortMalloc(configTIMER_TASK_STACK_DEPTH); pxStackBufferTemp = pvPortMalloc(configTIMER_TASK_STACK_DEPTH);
assert(pxTCBBufferTemp != NULL); pxTCBBufferTemp = pvPortMalloc(sizeof(StaticTask_t));
assert(pxStackBufferTemp != NULL); assert(pxStackBufferTemp != NULL);
//Write back pointers assert(pxTCBBufferTemp != NULL);
*ppxTimerTaskTCBBuffer = pxTCBBufferTemp; // Write back pointers
*ppxTimerTaskStackBuffer = pxStackBufferTemp; *ppxTimerTaskStackBuffer = pxStackBufferTemp;
*ppxTimerTaskTCBBuffer = pxTCBBufferTemp;
*pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH; *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
} }
#endif //( configSUPPORT_STATIC_ALLOCATION == 1 ) #endif //( configSUPPORT_STATIC_ALLOCATION == 1 )