Skip to content

Fix SMP scheduler evicting task when preemption is disabled #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xyerophyte wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix SMP scheduler evicting task when preemption is disabled #1379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3524,9 +3524,12 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,

#if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_PREEMPTION == 1 ) )
{
BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];

prvYieldForTask( pxTCB );

if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )
if( ( xYieldPendingBefore == pdFALSE ) &&
( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )
{
xYieldRequired = pdTRUE;
}
Comment on lines +3527 to 3535
Expand Down Expand Up @@ -4890,7 +4893,12 @@ BaseType_t xTaskIncrementTick( void )
{
if( listCURRENT_LIST_LENGTH( &( pxReadyTasksLists[ pxCurrentTCBs[ xCoreID ]->uxPriority ] ) ) > 1U )
{
xYieldPendings[ xCoreID ] = pdTRUE;
#if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
if( pxCurrentTCBs[ xCoreID ]->xPreemptionDisable == pdFALSE )
#endif
{
xYieldPendings[ xCoreID ] = pdTRUE;
}
}
else
{
Expand Down Expand Up @@ -5222,6 +5230,16 @@ BaseType_t xTaskIncrementTick( void )
* SMP port. */
configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 );

#if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
if( pxCurrentTCBs[ xCoreID ]->xPreemptionDisable != pdFALSE )
{
/* The current task has preemption disabled - do not allow a
* context switch. The yield will be performed when preemption
* is re-enabled. */
xYieldPendings[ xCoreID ] = pdTRUE;
}
else
#endif /* #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 ) */
if( uxSchedulerSuspended != ( UBaseType_t ) 0U )
{
/* The scheduler is currently suspended - do not allow a context
Expand Down Expand Up @@ -5479,9 +5497,12 @@ BaseType_t xTaskRemoveFromEventList( const List_t * const pxEventList )

#if ( configUSE_PREEMPTION == 1 )
{
BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];

prvYieldForTask( pxUnblockedTCB );

if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )
if( ( xYieldPendingBefore == pdFALSE ) &&
( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )
{
xReturn = pdTRUE;
}
Comment on lines +5500 to 5508
Expand Down Expand Up @@ -8190,9 +8211,12 @@ TickType_t uxTaskResetEventItemValue( void )
{
#if ( configUSE_PREEMPTION == 1 )
{
BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];

prvYieldForTask( pxTCB );

if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )
if( ( xYieldPendingBefore == pdFALSE ) &&
( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )
{
if( pxHigherPriorityTaskWoken != NULL )
{
Expand Down Expand Up @@ -8324,9 +8348,12 @@ TickType_t uxTaskResetEventItemValue( void )
{
#if ( configUSE_PREEMPTION == 1 )
{
BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];

prvYieldForTask( pxTCB );

if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )
if( ( xYieldPendingBefore == pdFALSE ) &&
( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )
{
if( pxHigherPriorityTaskWoken != NULL )
{
Expand Down
Loading