[Backport v4.0-branch] kernel: Fix priority boost when locking a mutex #87839
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k_thread_priority_set() on a pended thread wasn't re-inserting into the waitq, causing the incorrect thread to run based on priority. When using the scalable waitq config, this can also break assumptions of the tree and leave the owner of a waitq still being in the waitq tree, cycles in the tree, or a crash. Remove and re-add a thread to a waitq to ensure the waitq remains in order and the tree's assumptions are not violated. To illustrate the issue, consider 4 threads in decreasing priority order: A, B, C, and D along with two mutexes, m0 and m1. This is implemented in the new complex_inversion mutex_api test. 1. D locks m1 2. C locks m0 3. C pends on m1 4. B pends on m1 5. A pends on m0, boosts C's priority, now tree on m1 is not sorted 6. D unlocks m1, left-most thread on tree is B. When removing B from tree it cannot be found because it searches to the right of C due to C's boosted priority when the node is actually on the left. rb_remove silently fails. 7. B unlocks m1, left-most thread on tree is still B and it tries to unpend itself, resulting in a NULL pointer dereference on B->base.pended_on. Signed-off-by: Josh DeWitt <[email protected]> (cherry picked from commit c05cfbf)
peter-mitsis
approved these changes
May 28, 2025
dcpleung
approved these changes
May 28, 2025
|
Contributor
|
Zephyr 4.0 branch is EOL |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport c05cfbf from #87235.
Fixes #89331