feat: ipc: add nested-free flag support to mutex #9529
Conversation
This file contains 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
polarvid
force-pushed
the
shell/nested-free-mtx
branch
from
89eae2d to
991ee32
Compare
9 tasks
mysterywolf
reviewed
Oct 24, 2024
mysterywolf
requested changes
Oct 24, 2024
mysterywolf
requested changes
Oct 24, 2024
polarvid
force-pushed
the
shell/nested-free-mtx
branch
from
991ee32 to
498f100
Compare
This patch introduces a `nested-free` control flag to the mutex, allowing more flexible control over mutex hold limits. The change is necessary to handle scenarios where nested mutex acquisition is restricted, since it will introduce possibility of data corruption in a nested access to the critical area. Changes: - Added `ctrl_flags` field in `rt_mutex` structure to replace the reserved field for holding control flags. - Introduced `RT_MUTEX_CTRL_NESTED_FREE` command in `rt_mutex_control` to enable the new flag. - Refactored mutex initialization by extracting common logic into a new `_mutex_init` function, reducing code duplication. - Updated the `_rt_mutex_take` function to respect the `nested-free` flag, preventing nested acquisition when the flag is set. - Modified `rt_mutex_control` to handle the new control command and return appropriate error codes for invalid commands. Signed-off-by: Shell <[email protected]>
polarvid
force-pushed
the
shell/nested-free-mtx
branch
from
498f100 to
c956a64
Compare
mysterywolf
requested changes
Nov 23, 2024
| @@ -1004,29 +1021,15 @@ static void _mutex_before_delete_detach(rt_mutex_t mutex) | |||
| * | |||
| * @warning This function can ONLY be called from threads. | |||
| */ | |||
| rt_err_t rt_mutex_init(rt_mutex_t mutex, const char *name, rt_uint8_t flag) | |||
There was a problem hiding this comment.
- 在init函数里通过RT_ASSERT函数来检查flag的合法性。
- 函数注释对flag的描述需要更新
| mutex->priority = 0xFF; | ||
| mutex->hold = 0; | ||
| mutex->ceiling_priority = 0xFF; | ||
| mutex->ctrl_flags = ctrl_flags; |
There was a problem hiding this comment.
Suggested change
| mutex->ctrl_flags = ctrl_flags; | |
| mutex->flag =flag; |
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.
拉取/合并请求描述：(PR description)
[
为什么提交这份PR (why to submit this PR)
This patch introduces a
nested-freecontrol flag to the mutex, allowing more flexible control over mutex hold limits. The change is necessary to handle scenarios where nested mutex acquisition is restricted, since it will introduce possibility of data corruption in a nested access to the critical area.你的解决方案是什么 (what is your solution)
Changes:
ctrl_flagsfield inrt_mutexstructure to replace the reserved field for holding control flags.RT_MUTEX_CTRL_NESTED_FREEcommand inrt_mutex_controlto enable the new flag._mutex_initfunction, reducing code duplication._rt_mutex_takefunction to respect thenested-freeflag, preventing nested acquisition when the flag is set.rt_mutex_controlto handle the new control command and return appropriate error codes for invalid commands.请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality：
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up