len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-06 13:15:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix(freertos-smp): Update critical nesting count in prvLock/UnlockQueue

Browse source 
prvLockQueue() and prvUnlockQueue() helper functions now only take the
ISR locks because they are always called with the task lock already
taken. However, these functions must also increment and decrement the
critical nesting count as both locks get taken eventually. This commit
fixes it.
This commit is contained in:
Sudeep Mohanty 2025-10-13 10:54:07 +02:00
parent 1b91c544f9
commit a1cc3bda48
1 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

66
queue.c
View file

@ -296,22 +296,28 @@ static void prvInitialiseNewQueue( const UBaseType_t uxQueueLength,
* queueENTER_CRITICAL/queueEXIT_CRITICAL. * queueENTER_CRITICAL/queueEXIT_CRITICAL.
*/ */
#if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) #if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) )
#define prvLockQueue( pxQueue ) \ #define prvLockQueue( pxQueue ) \
do { \ do { \
UBaseType_t ulState = portSET_INTERRUPT_MASK(); \ UBaseType_t ulState = portSET_INTERRUPT_MASK(); \
portGET_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( ( pxQueue )->xISRSpinlock ) ); \ const BaseType_t xCoreID = ( BaseType_t ) portGET_CORE_ID(); \
{ \ portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID ); \
if( ( pxQueue )->cRxLock == queueUNLOCKED ) \ portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) &( ( pxQueue )->xISRSpinlock ) ); \
{ \ { \
( pxQueue )->cRxLock = queueLOCKED_UNMODIFIED; \ if( ( pxQueue )->cRxLock == queueUNLOCKED ) \
} \ { \
if( ( pxQueue )->cTxLock == queueUNLOCKED ) \ ( pxQueue )->cRxLock = queueLOCKED_UNMODIFIED; \
{ \ } \
( pxQueue )->cTxLock = queueLOCKED_UNMODIFIED; \ if( ( pxQueue )->cTxLock == queueUNLOCKED ) \
} \ { \
} \ ( pxQueue )->cTxLock = queueLOCKED_UNMODIFIED; \
portRELEASE_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( ( pxQueue )->xISRSpinlock ) ); \ } \
portCLEAR_INTERRUPT_MASK( ulState ); \ } \
portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) &( ( pxQueue )->xISRSpinlock ) ); \
portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID ); \
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 ) \
{ \
portCLEAR_INTERRUPT_MASK( ulState ); \
} \
} while( 0 ) } while( 0 )
#else /* if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) */ #else /* if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) */
#define prvLockQueue( pxQueue ) \ #define prvLockQueue( pxQueue ) \
@ -2566,8 +2572,10 @@ static void prvUnlockQueue( Queue_t * const pxQueue )
* locked items can be added or removed, but the event lists cannot be * locked items can be added or removed, but the event lists cannot be
* updated. */ * updated. */
#if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) #if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) )
UBaseType_t ulState = portSET_INTERRUPT_MASK(); portDISABLE_INTERRUPTS();
portGET_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) ); BaseType_t xCoreID = ( BaseType_t ) portGET_CORE_ID();
portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );
portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) );
#else #else
queueENTER_CRITICAL( pxQueue ); queueENTER_CRITICAL( pxQueue );
#endif #endif
@ -2650,15 +2658,22 @@ static void prvUnlockQueue( Queue_t * const pxQueue )
} }
#if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) #if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) )
portRELEASE_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) ); portRELEASE_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) );
portCLEAR_INTERRUPT_MASK( ulState ); portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 )
{
portENABLE_INTERRUPTS();
}
#else #else
queueEXIT_CRITICAL( pxQueue ); queueEXIT_CRITICAL( pxQueue );
#endif #endif
/* Do the same for the Rx lock. */ /* Do the same for the Rx lock. */
#if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) #if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) )
ulState = portSET_INTERRUPT_MASK(); portDISABLE_INTERRUPTS();
portGET_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) ); xCoreID = ( BaseType_t ) portGET_CORE_ID();
portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );
portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) );
#else #else
queueENTER_CRITICAL( pxQueue ); queueENTER_CRITICAL( pxQueue );
#endif #endif
@ -2689,8 +2704,13 @@ static void prvUnlockQueue( Queue_t * const pxQueue )
pxQueue->cRxLock = queueUNLOCKED; pxQueue->cRxLock = queueUNLOCKED;
} }
#if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) ) #if ( ( portUSING_GRANULAR_LOCKS == 1 ) && ( configNUMBER_OF_CORES > 1 ) )
portRELEASE_SPINLOCK( portGET_CORE_ID(), ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) ); portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) &( pxQueue->xISRSpinlock ) );
portCLEAR_INTERRUPT_MASK( ulState ); portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 )
{
portENABLE_INTERRUPTS();
}
#else #else
queueEXIT_CRITICAL( pxQueue ); queueEXIT_CRITICAL( pxQueue );
#endif #endif