len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-10-13 16:27:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(freertos-smp): Always take ISR locks in vTaskEnter/ExitCriticalFromISR

Browse source
This commit is contained in:
Sudeep Mohanty 2025-08-25 10:41:22 +02:00
parent 5098b1ae26
commit 1b91c544f9
1 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tasks.c
View file

@ -7582,10 +7582,18 @@ static void prvResetNextTaskUnblockTime( void )
{ {
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR(); uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U ) #if ( portUSING_GRANULAR_LOCKS == 1 )
{ {
kernelGET_ISR_LOCK( xCoreID ); kernelGET_ISR_LOCK( xCoreID );
} }
#else /* portUSING_GRANULAR_LOCKS */
{
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
{
kernelGET_ISR_LOCK( xCoreID );
}
}
#endif /* portUSING_GRANULAR_LOCKS */
portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID ); portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );
} }
@ -7775,17 +7783,28 @@ static void prvResetNextTaskUnblockTime( void )
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U ) if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U )
{ {
portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID ); #if ( portUSING_GRANULAR_LOCKS == 1 )
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
{ {
kernelRELEASE_ISR_LOCK( xCoreID ); kernelRELEASE_ISR_LOCK( xCoreID );
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
{
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
}
} }
else #else /* portUSING_GRANULAR_LOCKS */
{ {
mtCOVERAGE_TEST_MARKER(); portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );
if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U )
{
kernelRELEASE_ISR_LOCK( xCoreID );
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
}
} }
#endif /* portUSING_GRANULAR_LOCKS */
} }
else else
{ {