mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-19 21:11:57 -04:00
563c57e7da
Both the TLS block and stack must be correctly aligned when using picolibc. The architecture stack alignment is represented by the portBYTE_ALIGNMENT_MASK and the TLS block alignment is provided by the Picolibc _tls_align() inline function for Picolibc version 1.8 and above. For older versions of Picolibc, we'll assume that the TLS block requires the same alignment as the stack. For downward growing stacks, this requires aligning the start of the TLS block to the maximum of the stack alignment and the TLS alignment. With this, both the TLS block and stack will now be correctly aligned. For upward growing stacks, the two areas must be aligned independently; the TLS block is aligned from the start of the stack, then the tls space is allocated, and then the stack is aligned above that. It's probably useful to know here that the linker ensures that variables within the TLS block are assigned offsets that match their alignment requirements. If the TLS block itself is correctly aligned, then everything within will also be. I have only tested the downward growing stack branch of this patch. Signed-off-by: Keith Packard <keithpac@amazon.com> Co-authored-by: Keith Packard <keithpac@amazon.com> Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
91 lines
4.3 KiB
C
91 lines
4.3 KiB
C
/*
|
|
* 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 *
|
|
|
|
#define picolibcTLS_SIZE ( ( portPOINTER_SIZE_TYPE ) _tls_size() )
|
|
#define picolibcSTACK_ALIGNMENT_MASK ( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK )
|
|
|
|
#if __PICOLIBC_MAJOR__ > 1 || __PICOLIBC_MINOR__ >= 8
|
|
|
|
/* Picolibc 1.8 and newer have explicit alignment values provided
|
|
* by the _tls_align() inline */
|
|
#define picolibcTLS_ALIGNMENT_MASK ( ( portPOINTER_SIZE_TYPE ) ( _tls_align() - 1 ) )
|
|
#else
|
|
|
|
/* For older Picolibc versions, use the general port alignment value */
|
|
#define picolibcTLS_ALIGNMENT_MASK ( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK )
|
|
#endif
|
|
|
|
/* 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 ) \
|
|
- picolibcTLS_SIZE ) & ~ \
|
|
configMAX( picolibcSTACK_ALIGNMENT_MASK, \
|
|
picolibcTLS_ALIGNMENT_MASK ) ); \
|
|
xTLSBlock = pxTopOfStack; \
|
|
_init_tls( xTLSBlock ); \
|
|
} while( 0 )
|
|
#else /* portSTACK_GROWTH */
|
|
#define configINIT_TLS_BLOCK( xTLSBlock, pxTopOfStack ) \
|
|
do { \
|
|
xTLSBlock = ( void * ) ( ( ( portPOINTER_SIZE_TYPE ) pxTopOfStack + \
|
|
picolibcTLS_ALIGNMENT_MASK ) & ~picolibcTLS_ALIGNMENT_MASK ); \
|
|
pxTopOfStack = ( StackType_t * ) ( ( ( ( ( portPOINTER_SIZE_TYPE ) xTLSBlock ) + \
|
|
picolibcTLS_SIZE ) + picolibcSTACK_ALIGNMENT_MASK ) & \
|
|
~picolibcSTACK_ALIGNMENT_MASK ); \
|
|
_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 */
|