-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Thread Local Storage (TLS) support using Picolibc functions (#343)
* Pass top of stack to configINIT_TLS_BLOCK Picolibc wants to allocate the per-task TLS block within the stack segment, so it will need to modify the top of stack value. Pass the pxTopOfStack variable to make this explicit. Signed-off-by: Keith Packard <[email protected]> * Move newlib-specific definitions to separate file This reduces the clutter in FreeRTOS.h caused by having newlib-specific macros present there. Signed-off-by: Keith Packard <[email protected]> * Make TLS code depend only on configUSE_C_RUNTIME_TLS_SUPPORT Remove reference to configUSE_NEWLIB_REENTRANT as that only works when using newlib. configUSE_C_RUNTIME_TLS_SUPPORT is always set when configUSE_NEWLIB_REENTRANT is set, so using both was redundant in that case. Signed-off-by: Keith Packard <[email protected]> * portable-ARC: Adapt ARC support to use generalized TLS support With generalized thread local storage (TLS) support present in the core, the two ARC ports need to have the changes to the TCB mirrored to them. Signed-off-by: Keith Packard <[email protected]> * Add Thread Local Storage (TLS) support using Picolibc functions This patch provides definitions of the general TLS support macros in terms of the Picolibc TLS support functions. Picolibc is normally configured to use TLS internally for all variables that are intended to be task-local, so these changes are necessary for picolibc to work correctly with FreeRTOS. The picolibc helper functions rely on elements within the linker script to arrange the TLS data in memory and define some symbols. Applications wanting to use this mechanism will need changes in their linker script when migrating to picolibc. Signed-off-by: Keith Packard <[email protected]> --------- Signed-off-by: Keith Packard <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]>
- Loading branch information
3 people
authored
Mar 2, 2023
1 parent
e6514fb
commit c3e1df0
Showing
7 changed files
with
155 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * FreeRTOS Kernel <DEVELOPMENT BRANCH> | ||
| * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the "Software"), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * https://www.FreeRTOS.org | ||
| * https://github.com/FreeRTOS | ||
| * | ||
| */ | ||
|
|
||
| #ifndef INC_NEWLIB_FREERTOS_H | ||
| #define INC_NEWLIB_FREERTOS_H | ||
|
|
||
| /* Note Newlib support has been included by popular demand, but is not | ||
| * used by the FreeRTOS maintainers themselves. FreeRTOS is not | ||
| * responsible for resulting newlib operation. User must be familiar with | ||
| * newlib and must provide system-wide implementations of the necessary | ||
| * stubs. Be warned that (at the time of writing) the current newlib design | ||
| * implements a system-wide malloc() that must be provided with locks. | ||
| * | ||
| * See the third party link http://www.nadler.com/embedded/newlibAndFreeRTOS.html | ||
| * for additional information. */ | ||
|
|
||
| #include <reent.h> | ||
|
|
||
| #define configUSE_C_RUNTIME_TLS_SUPPORT 1 | ||
|
|
||
| #ifndef configTLS_BLOCK_TYPE | ||
| #define configTLS_BLOCK_TYPE struct _reent | ||
| #endif | ||
|
|
||
| #ifndef configINIT_TLS_BLOCK | ||
| #define configINIT_TLS_BLOCK( xTLSBlock, pxTopOfStack ) _REENT_INIT_PTR( &( xTLSBlock ) ) | ||
| #endif | ||
|
|
||
| #ifndef configSET_TLS_BLOCK | ||
| #define configSET_TLS_BLOCK( xTLSBlock ) _impure_ptr = &( xTLSBlock ) | ||
| #endif | ||
|
|
||
| #ifndef configDEINIT_TLS_BLOCK | ||
| #define configDEINIT_TLS_BLOCK( xTLSBlock ) _reclaim_reent( &( xTLSBlock ) ) | ||
| #endif | ||
|
|
||
| #endif /* INC_NEWLIB_FREERTOS_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * FreeRTOS Kernel <DEVELOPMENT BRANCH> | ||
| * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the "Software"), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * https://www.FreeRTOS.org | ||
| * https://github.com/FreeRTOS | ||
| * | ||
| */ | ||
|
|
||
| #ifndef INC_PICOLIBC_FREERTOS_H | ||
| #define INC_PICOLIBC_FREERTOS_H | ||
|
|
||
| /* Use picolibc TLS support to allocate space for __thread variables, | ||
| * initialize them at thread creation and set the TLS context at | ||
| * thread switch time. | ||
| * | ||
| * See the picolibc TLS docs: | ||
| * https://github.com/picolibc/picolibc/blob/main/doc/tls.md | ||
| * for additional information. */ | ||
|
|
||
| #include <picotls.h> | ||
|
|
||
| #define configUSE_C_RUNTIME_TLS_SUPPORT 1 | ||
|
|
||
| #define configTLS_BLOCK_TYPE void * | ||
|
|
||
| /* Allocate thread local storage block off the end of the | ||
| * stack. The _tls_size() function returns the size (in | ||
| * bytes) of the total TLS area used by the application */ | ||
| #if ( portSTACK_GROWTH < 0 ) | ||
| #define configINIT_TLS_BLOCK( xTLSBlock, pxTopOfStack ) \ | ||
| do { \ | ||
| pxTopOfStack = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack ) - _tls_size() ); \ | ||
| xTLSBlock = pxTopOfStack; \ | ||
| _init_tls( xTLSBlock ); \ | ||
| } while( 0 ) | ||
| #else /* portSTACK_GROWTH */ | ||
| #define configINIT_TLS_BLOCK( xTLSBlock, pxTopOfStack ) \ | ||
| do { \ | ||
| xTLSBlock = pxTopOfStack; \ | ||
| pxTopOfStack = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack ) + _tls_size() ); \ | ||
| _init_tls( xTLSBlock ); \ | ||
| } while( 0 ) | ||
| #endif /* portSTACK_GROWTH */ | ||
|
|
||
| #define configSET_TLS_BLOCK( xTLSBlock ) _set_tls( xTLSBlock ) | ||
|
|
||
| #define configDEINIT_TLS_BLOCK( xTLSBlock ) | ||
|
|
||
| #endif /* INC_PICOLIBC_FREERTOS_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters