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 3 commits into
base: main
Choose a base branch
from
+16 −1
Open

Fix SMP scheduler evicting task when preemption is disabled #1379

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c926adc
Fix SMP scheduler evicting task when preemption is disabled
Xyerophyte Mar 14, 2026
47691e6
Fix suppressed ISR yield reporting in SMP preemption fix
Xyerophyte Apr 12, 2026
a1471c9
Merge branch 'main' into fix/smp-preemption-disable-yield-pending
Xyerophyte Apr 12, 2026
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
17 changes: 16 additions & 1 deletion tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,7 +4890,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 +5227,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