Fix suppressed ISR yield reporting in SMP preemption fix

Xyerophyte · Xyerophyte · commit 47691e6c90c5 · 2026-04-12T18:20:59.000+05:30
Restore the original post-prvYieldForTask() yield checks so FromISR paths still report a required yield when xYieldPendings[] was already set. Keep the xTaskIncrementTick() root-cause fix and the vTaskSwitchContext() preemption-disable safety net.
diff --git a/tasks.c b/tasks.c
@@ -3524,12 +3524,9 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
 
                 #if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_PREEMPTION == 1 ) )
                 {
-                    BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];
-
                     prvYieldForTask( pxTCB );
 
-                    if( ( xYieldPendingBefore == pdFALSE ) &&
-                        ( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )
+                    if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )
                     {
                         xYieldRequired = pdTRUE;
                     }
@@ -5497,12 +5494,9 @@ BaseType_t xTaskRemoveFromEventList( const List_t * const pxEventList )
 
         #if ( configUSE_PREEMPTION == 1 )
         {
-            BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];
-
             prvYieldForTask( pxUnblockedTCB );
 
-            if( ( xYieldPendingBefore == pdFALSE ) &&
-                ( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )
+            if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )
             {
                 xReturn = pdTRUE;
             }
@@ -8211,12 +8205,9 @@ TickType_t uxTaskResetEventItemValue( void )
                 {
                     #if ( configUSE_PREEMPTION == 1 )
                     {
-                        BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];
-
                         prvYieldForTask( pxTCB );
 
-                        if( ( xYieldPendingBefore == pdFALSE ) &&
-                            ( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )
+                        if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )
                         {
                             if( pxHigherPriorityTaskWoken != NULL )
                             {
@@ -8348,12 +8339,9 @@ TickType_t uxTaskResetEventItemValue( void )
                 {
                     #if ( configUSE_PREEMPTION == 1 )
                     {
-                        BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];
-
                         prvYieldForTask( pxTCB );
 
-                        if( ( xYieldPendingBefore == pdFALSE ) &&
-                            ( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )
+                        if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )
                         {
                             if( pxHigherPriorityTaskWoken != NULL )
                             {

Original file line number	Diff line number	Diff line change
`@@ -3524,12 +3524,9 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,`
`3524`	`3524`
`3525`	`3525`	`#if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_PREEMPTION == 1 ) )`
`3526`	`3526`	`{`
`3527`		`- BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];`
`3528`		`-`
`3529`	`3527`	`prvYieldForTask( pxTCB );`
`3530`	`3528`
`3531`		`- if( ( xYieldPendingBefore == pdFALSE ) &&`
`3532`		`- ( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )`
	`3529`	`+ if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )`
`3533`	`3530`	`{`
`3534`	`3531`	`xYieldRequired = pdTRUE;`
`3535`	`3532`	`}`
`@@ -5497,12 +5494,9 @@ BaseType_t xTaskRemoveFromEventList( const List_t * const pxEventList )`
`5497`	`5494`
`5498`	`5495`	`#if ( configUSE_PREEMPTION == 1 )`
`5499`	`5496`	`{`
`5500`		`- BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];`
`5501`		`-`
`5502`	`5497`	`prvYieldForTask( pxUnblockedTCB );`
`5503`	`5498`
`5504`		`- if( ( xYieldPendingBefore == pdFALSE ) &&`
`5505`		`- ( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE ) )`
	`5499`	`+ if( xYieldPendings[ portGET_CORE_ID() ] != pdFALSE )`
`5506`	`5500`	`{`
`5507`	`5501`	`xReturn = pdTRUE;`
`5508`	`5502`	`}`
`@@ -8211,12 +8205,9 @@ TickType_t uxTaskResetEventItemValue( void )`
`8211`	`8205`	`{`
`8212`	`8206`	`#if ( configUSE_PREEMPTION == 1 )`
`8213`	`8207`	`{`
`8214`		`- BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];`
`8215`		`-`
`8216`	`8208`	`prvYieldForTask( pxTCB );`
`8217`	`8209`
`8218`		`- if( ( xYieldPendingBefore == pdFALSE ) &&`
`8219`		`- ( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )`
	`8210`	`+ if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )`
`8220`	`8211`	`{`
`8221`	`8212`	`if( pxHigherPriorityTaskWoken != NULL )`
`8222`	`8213`	`{`
`@@ -8348,12 +8339,9 @@ TickType_t uxTaskResetEventItemValue( void )`
`8348`	`8339`	`{`
`8349`	`8340`	`#if ( configUSE_PREEMPTION == 1 )`
`8350`	`8341`	`{`
`8351`		`- BaseType_t xYieldPendingBefore = xYieldPendings[ portGET_CORE_ID() ];`
`8352`		`-`
`8353`	`8342`	`prvYieldForTask( pxTCB );`
`8354`	`8343`
`8355`		`- if( ( xYieldPendingBefore == pdFALSE ) &&`
`8356`		`- ( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE ) )`
	`8344`	`+ if( xYieldPendings[ portGET_CORE_ID() ] == pdTRUE )`
`8357`	`8345`	`{`
`8358`	`8346`	`if( pxHigherPriorityTaskWoken != NULL )`
`8359`	`8347`	`{`