Skip to content

Add check for if the scheduler is running to MPU ports #954

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.

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

Merged
merged 5 commits into from
Jan 23, 2024

Conversation

Skptak
Copy link
Member

@Skptak Skptak commented Jan 16, 2024

Description

Add a check for if the scheduler is running to xPortIsAuthorizedToAccessBuffer().

This fixes an issue where before the scheduler is started APIs can fail as the TCB pointed to by pxCurrentTCB may not have access to requested APIs.

Test Steps

Call xTimerStart(), which calls MPU_xTimerGenericCommandFromTask:

xReturn = MPU_xTimerGenericCommandFromTaskEntry( &( xParams ) );

Which calls MPU_xTimerGenericCommandFromTaskEntry

BaseType_t MPU_xTimerGenericCommandFromTaskEntry(
    const xTimerGenericCommandFromTaskParams_t * pxParams
 ) /* __attribute__ (( naked )) FREERTOS_SYSTEM_CALL */
    {
        __asm volatile
        (
            " .syntax unified                                               \n"
            " .extern MPU_xTimerGenericCommandFromTaskImpl                  \n"
            "                                                               \n"
            " push {r0}                                                     \n"
            " mrs r0, control                                               \n"
            " tst r0, #1                                                    \n"
            " bne MPU_xTimerGenericCommandFromTask_Unpriv                   \n"
            " MPU_xTimerGenericCommandFromTask_Priv:                        \n"
            "     pop {r0}                                                  \n"
            "     b MPU_xTimerGenericCommandFromTaskImpl                    \n"

This calls MPU_xTimerGenericCommandFromTaskImpl:

xAreParamsReadable = xPortIsAuthorizedToAccessBuffer( pxParams,
                                            sizeof( xTimerGenericCommandFromTaskParams_t ),
                                            tskMPU_READ_PERMISSION );
}

Which calls xPortIsAuthorizedToAccessBuffer
This loads pxCurrentTCB to check if you are allowed to start the timer

BaseType_t xPortIsAuthorizedToAccessBuffer(
    const void * pvBuffer,
    uint32_t ulBufferLength,
    uint32_t ulAccessRequested
) /* PRIVILEGED_FUNCTION */
{
    uint32_t i, ulBufferStartAddress, ulBufferEndAddress;
    BaseType_t xAccessGranted = pdFALSE;
    const xMPU_SETTINGS * xTaskMpuSettings = xTaskGetMPUSettings( NULL ); /* Calling task's MPU settings. */

    if( ( xTaskMpuSettings->ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG ) == portTASK_IS_PRIVILEGED_FLAG )
    {
            xAccessGranted = pdTRUE;
    }
    else
    {
        <CHECK_IF_ACCESS_ALLOWED>

However, there's no actual calling task that made this call. It just checks whatever TCB happens to be there.

A check is needed for when the scheduler is not running yet, as at this point the current TCB is irrelevant to the operation being performed.

Checklist:

  • I have tested my changes. No regression in existing tests.
  • I have modified and/or added unit-tests to cover the code changes in this Pull Request.

Related Issue

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

…_MPU/port.c:xPortIsAuthorizedToAccessBuffer()
…_MPU/port.c:xPortIsAuthorizedToAccessBuffer()
…F_MPU/port.c:xPortIsAuthorizedToAccessBuffer()
…4_MPU/port.c:xPortIsAuthorizedToAccessBuffer()
@Skptak Skptak marked this pull request as ready for review January 16, 2024 16:59
@Skptak Skptak requested a review from a team as a code owner January 16, 2024 16:59
Copy link

codecov bot commented Jan 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (cf2366c) 93.42% compared to head (921ea9a) 93.42%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #954   +/-   ##
=======================================
  Coverage   93.42%   93.42%           
=======================================
  Files           6        6           
  Lines        3196     3196           
  Branches      886      886           
=======================================
  Hits         2986     2986           
  Misses        103      103           
  Partials      107      107           
Flag Coverage Δ
unittests 93.42% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Skptak Skptak changed the title Add scheduler check to mpu ports Add check for if the scheduler is running to MPU ports Jan 16, 2024
Copy link

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@Skptak Skptak merged commit 4d9f652 into FreeRTOS:main Jan 23, 2024
@Skptak Skptak deleted the AddSchedulerCheckToMPUPorts branch January 25, 2024 17:40
laroche pushed a commit to laroche/FreeRTOS-Kernel that referenced this pull request Apr 18, 2024
* Add IPv6 Demo (FreeRTOS#937)

* Add demo changes

* Update kernel and library paths

* Update main.c

* Run uncrustify

* Fix spell checker

* CI check file headers update

* Add IPv6/v4 UDP echo server with zero copy/non-zero copy versions

* Add VS proj file changes to include the UDP echo sample code

* readme update

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>

* Update Backward Compatibility Flag (FreeRTOS#954)

* Update Backward Compatibility Flag

* Update FreeRTOS_GetUDPPayloadBuffer_ByIPType

* Update FreeRTOS_IPStart to FreeRTOS_IPInit_Multi

* Update Application APIs

* Remove ipconfigCOMPATIBLE_WITH_SINGLE

* Update Static Lib files (FreeRTOS#956)

* Update Static Lib files

* making vApplicationIPNetworkEventHook backward compatible in demos

* Update CI check file headers

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>

* Add WinPCap NetworkInterface Changes (FreeRTOS#958)

* Update winpcap network interface

* Run uncrustify

* Update function to include NetworkInterface_t parameters

* Adding compatibility for xApplicationDNSQueryHook with latest dev branch for old demos (FreeRTOS#957)

* adding compatibility for xApplicationDNSQueryHook with latest dev branch

* adding tcp echo server source

* removing unused sub demos

* fix build issues (FreeRTOS#969)

* Update demo to latest +TCP dev/IPv6_integration (FreeRTOS#978)

* remove macro namings

* rename sin_addr to sin_address.ulIP_IPv4 for ipv6 demo

* replace in6addr_any with FreeRTOS_in6addr_any

* replace mainCREATE_UDP_ECHO_SERVER_TASK with mainCREATE_UDP_ECHO_TASKS_SINGLE

* handle removal of sin_addr macro to sin_address.ulIP_IPv4

* updating +TCP repo to latest dev/IPv6_integration

* minor update to more clear code

* more sin_addr to sin_address.ulIP_IPv4 replacements

* fix makefiles for qemu and posix demos

* review feedback changes

* Update FreeRTOS-Plus-TCP for RC2

* Change from PR (FreeRTOS#994)

* Update FreeRTOS-Plus-TCP for RC2

* Update copyright

* Ignore WinPCap for files header check failure.

* Update checker

* Update manifest

* Point manifest to latest commit

* Fix Spell-checker

* Update doxygen

* Update xApplicationDHCPHook for backward compatibility  (FreeRTOS#999)

* Update xApplicationDHCPHook for backward compatability

* Update IPv6

* Update VisualStudio Static Project files

* Update pxEndPoint error (FreeRTOS#1002)

* Update IPv6 demo ReadMe (FreeRTOS#1004)

* Update ReadMe

* Update setup requirement

* Update UDP demo info

* Update comment

* TCP demo changes post build separation (FreeRTOS#1011)

* adding sin_family to dest adddr for FreeRTOS_sendto

* updating FreeRTOS_bind to input sin_family post build separation changes

* updating FreeRTOS_connect to input sin_family post build separation changes

* minor fix

* updating copyright year

* updating file headers

* updating +TCP submodule

* updating file headers

* updating file headers

* updating manifest file to have latest +TCP submodule hash

* Fix issue with posix demo while running with ipconfigIPv4_BACKWARD_COMPATIBLE enabled for +TCP stack (FreeRTOS#1027)

* Update the submodule pointer to IPv6 main

* Update manifest with latest TCP commit

* Update file checker exception

* Ignore Visual studio project file from file header checker

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants