Merge 26655c7e54 into 0ae0715ac9

feat(freertos/smp): Add Granular Locking V4 proposal documents
Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
2025-07-05 11:57:15 -04:00 · 2025-06-16 19:30:56 -07:00 · 2025-06-12 10:11:04 +02:00 · 2025-06-12 10:11:04 +02:00 · 2025-06-12 10:11:04 +02:00 · 2025-06-12 10:11:04 +02:00
1 changed files with 21 additions and 45 deletions
--- a/tasks.c
+++ b/tasks.c
@ -461,7 +461,7 @@ typedef struct tskTaskControlBlock       /* The old naming convention is used to
    #endif

    #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
-        UBaseType_t uxDeferredStateChange; /**< Used to indicate if the task's state change is deferred. */
+        BaseType_t xDeferredStateChange; /**< Used to indicate if the task's state change is deferred. */
    #endif

    #if ( ( portSTACK_GROWTH > 0 ) || ( configRECORD_STACK_HIGH_ADDRESS == 1 ) )
@ -2309,7 +2309,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
                 * task enables preemption. The deletion will be performed in vTaskPreemptionEnable(). */
                if( pxTCB->uxPreemptionDisable > 0U )
                {
-                    pxTCB->uxDeferredStateChange |= tskDEFERRED_DELETION;
+                    pxTCB->xDeferredStateChange |= tskDEFERRED_DELETION;
                    xDeferredDeletion = pdTRUE;
                }
                else
@ -3243,13 +3243,13 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
                {
                    /* Process deferred state changes which were inflicted while
                     * preemption was disabled. */
-                    if( pxTCB->uxDeferredStateChange != 0U )
+                    if( pxTCB->xDeferredStateChange != 0U )
                    {
-                        if( pxTCB->uxDeferredStateChange & tskDEFERRED_DELETION )
+                        if( pxTCB->xDeferredStateChange & tskDEFERRED_DELETION )
                        {
                            vTaskDelete( xTask );
                        }
-                        else if( pxTCB->uxDeferredStateChange & tskDEFERRED_SUSPENSION )
+                        else if( pxTCB->xDeferredStateChange & tskDEFERRED_SUSPENSION )
                        {
                            vTaskSuspend( xTask );
                        }
@ -3258,7 +3258,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
                            mtCOVERAGE_TEST_MARKER();
                        }

-                        pxTCB->uxDeferredStateChange = 0U;
+                        pxTCB->xDeferredStateChange = 0U;
                    }
                    else
                    {
@ -3315,7 +3315,7 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
                 * task enables preemption. The suspension will be performed in vTaskPreemptionEnable(). */
                if( pxTCB->uxPreemptionDisable > 0U )
                {
-                    pxTCB->uxDeferredStateChange |= tskDEFERRED_SUSPENSION;
+                    pxTCB->xDeferredStateChange |= tskDEFERRED_SUSPENSION;
                    xDeferredSuspension = pdTRUE;
                }
                else
@ -3558,10 +3558,6 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
    {
        TCB_t * const pxTCB = xTaskToResume;

-        #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
-            BaseType_t xTaskResumed = pdFALSE;
-        #endif /* #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 ) */
-
        traceENTER_vTaskResume( xTaskToResume );

        /* It does not make sense to resume the calling task. */
@ -3584,43 +3580,23 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
        {
            kernelENTER_CRITICAL();
            {
-                #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
-
-                    /* If the task being resumed is in a deferred suspension state,
-                     * we simply clear the deferred suspension state and return. */
-                    if( pxTCB->uxDeferredStateChange & tskDEFERRED_SUSPENSION )
-                    {
-                        pxTCB->uxDeferredStateChange &= ~tskDEFERRED_SUSPENSION;
-                        xTaskResumed = pdTRUE;
-                    }
-                    else
-                    {
-                        mtCOVERAGE_TEST_MARKER();
-                    }
-                #endif /* configUSE_TASK_PREEMPTION_DISABLE */
-
-                #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 )
-                    if( xTaskResumed == pdFALSE )
-                #endif /* #if ( configUSE_TASK_PREEMPTION_DISABLE == 1 ) */
+                if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )
                {
-                    if( prvTaskIsTaskSuspended( pxTCB ) != pdFALSE )
-                    {
-                        traceTASK_RESUME( pxTCB );
+                    traceTASK_RESUME( pxTCB );

-                        /* The ready list can be accessed even if the scheduler is
-                         * suspended because this is inside a critical section. */
-                        ( void ) uxListRemove( &( pxTCB->xStateListItem ) );
-                        prvAddTaskToReadyList( pxTCB );
+                    /* The ready list can be accessed even if the scheduler is
+                     * suspended because this is inside a critical section. */
+                    ( void ) uxListRemove( &( pxTCB->xStateListItem ) );
+                    prvAddTaskToReadyList( pxTCB );

-                        /* This yield may not cause the task just resumed to run,
-                         * but will leave the lists in the correct state for the
-                         * next yield. */
-                        taskYIELD_ANY_CORE_IF_USING_PREEMPTION( pxTCB );
-                    }
-                    else
-                    {
-                        mtCOVERAGE_TEST_MARKER();
-                    }
+                    /* This yield may not cause the task just resumed to run,
+                     * but will leave the lists in the correct state for the
+                     * next yield. */
+                    taskYIELD_ANY_CORE_IF_USING_PREEMPTION( pxTCB );
+                }
+                else
+                {
+                    mtCOVERAGE_TEST_MARKER();
                }
            }
            kernelEXIT_CRITICAL();
Author	SHA1	Message	Date
Sudeep Mohanty	fcdf6178e6	Merge `26655c7e54` into `0ae0715ac9`	2025-06-16 19:30:56 -07:00
Darian Leung	26655c7e54	feat(freertos/smp): Add Granular Locking V4 proposal documents Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:11:04 +02:00
Darian Leung	95fa53c1ee	change(freertos/smp): Update timers.c locking Updated timers.c to use granular locking - Added xTaskSpinlock and xISRSpinlock - Replaced critical section macros with data group critical section macros such as taskENTER/EXIT_CRITICAL() with tmrENTER/EXIT_CRITICAL(). - Added vTimerEnterCritical() and vTimerExitCritical() to map to the data group critical section macros. Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:11:04 +02:00
Darian Leung	e1f69a6763	change(freertos/smp): Update stream_buffer.c locking Updated stream_buffer.c to use granular locking - Added xTaskSpinlock and xISRSpinlock - Replaced critical section macros with data group critical section macros such as taskENTER/EXIT_CRITICAL/_FROM_ISR() with sbENTER/EXIT_CRITICAL_FROM_ISR(). - Added vStreambuffersEnterCritical/FromISR() and vStreambuffersExitCritical/FromISR() to map to the data group critical section macros. - Added prvLockStreamBufferForTasks() and prvUnlockStreamBufferForTasks() to suspend the stream buffer when executing non-deterministic code. Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:11:04 +02:00
Darian Leung	cba76ba77d	change(freertos/smp): Update event_groups.c locking Updated event_groups.c to use granular locking - Added xTaskSpinlock and xISRSpinlock - Replaced critical section macros with data group critical section macros such as taskENTER/EXIT_CRITICAL/_FROM_ISR() with event_groupsENTER/EXIT_CRITICAL/_FROM_ISR(). - Added vEventGroupsEnterCritical/FromISR() and vEventGroupsExitCriti/FromISR() functions that map to the data group critical section macros. - Added prvLockEventGroupForTasks() and prvUnlockEventGroupForTasks() to suspend the event group when executing non-deterministic code. - xEventGroupSetBits() and vEventGroupDelete() accesses the kernel data group directly. Thus, added vTaskSuspendAll()/xTaskResumeAll() to these fucntions. Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:11:04 +02:00
Darian Leung	b256ca88b1	change(freertos/smp): Update queue.c locking Updated queue.c to use granular locking - Added xTaskSpinlock and xISRSpinlock - Replaced critical section macros with data group critical section macros such as taskENTER/EXIT_CRITICAL/_FROM_ISR() with queueENTER/EXIT_CRITICAL_FROM_ISR(). - Added vQueueEnterCritical/FromISR() and vQueueExitCritical/FromISR() which map to the data group critical section macros. - Added prvLockQueueForTasks() and prvUnlockQueueForTasks() as the granular locking equivalents to prvLockQueue() and prvUnlockQueue() respectively Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:11:04 +02:00
Darian Leung	25c74e3d4b	change(freertos/smp): Update tasks.c locking Updated critical section macros with granular locks. Some tasks.c API relied on their callers to enter critical sections. This assumption no longer works under granular locking. Critical sections added to the following functions: - `vTaskInternalSetTimeOutState()` - `xTaskIncrementTick()` - `vTaskSwitchContext()` - `xTaskRemoveFromEventList()` - `vTaskInternalSetTimeOutState()` - `eTaskConfirmSleepModeStatus()` - `xTaskPriorityDisinherit()` - `pvTaskIncrementMutexHeldCount()` Added missing suspensions to the following functions: - `vTaskPlaceOnEventList()` - `vTaskPlaceOnUnorderedEventList()` - `vTaskPlaceOnEventListRestricted()` Fixed the locking in vTaskSwitchContext() vTaskSwitchContext() must aquire both kernel locks, viz., task lock and ISR lock. This is because, vTaskSwitchContext() can be called from either task context or ISR context. Also, vTaskSwitchContext() must not alter the interrupt state prematurely. Co-authored-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>	2025-06-12 10:10:55 +02:00