Skip to content
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

feat: ipc: add nested-free flag support to mutex #9529

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

polarvid
Copy link
Contributor

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

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.

你的解决方案是什么 (what is your solution)

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.

请提供验证的bsp和config (provide the config and bsp)

  • BSP:
  • .config:
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@polarvid polarvid force-pushed the shell/nested-free-mtx branch from 89eae2d to 991ee32 Compare October 14, 2024 03:01
@github-actions github-actions bot added the Kernel PR has src relate code label Oct 14, 2024
@polarvid polarvid closed this Oct 16, 2024
@polarvid polarvid reopened this Oct 16, 2024
@polarvid polarvid marked this pull request as ready for review October 16, 2024 02:39
@Rbb666 Rbb666 requested a review from mysterywolf October 24, 2024 12:19
src/ipc.c Outdated Show resolved Hide resolved
src/ipc.c Outdated Show resolved Hide resolved
src/ipc.c Outdated Show resolved Hide resolved
src/ipc.c Outdated Show resolved Hide resolved
include/rtthread.h Outdated Show resolved Hide resolved
@polarvid polarvid force-pushed the shell/nested-free-mtx branch 2 times, most recently from 498f100 to c956a64 Compare November 19, 2024 07:45
@Rbb666 Rbb666 requested a review from mysterywolf November 22, 2024 09:50
src/ipc.c Show resolved Hide resolved
mutex->priority = 0xFF;
mutex->hold = 0;
mutex->ceiling_priority = 0xFF;
mutex->ctrl_flags = ctrl_flags;
Copy link
Member

@mysterywolf mysterywolf Nov 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mutex->ctrl_flags = ctrl_flags;
mutex->flag =flag;

Copy link
Contributor Author

@polarvid polarvid Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

结构体成员的名字,清晰一点为好。所以我觉得没必要改这个。

@polarvid polarvid force-pushed the shell/nested-free-mtx branch 4 times, most recently from 2aac7eb to e7bc5c0 Compare January 3, 2025 06:38
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 <smokewood@qq.com>
@polarvid polarvid force-pushed the shell/nested-free-mtx branch from e7bc5c0 to af9ecca Compare January 3, 2025 06:51
@Rbb666 Rbb666 requested a review from mysterywolf January 5, 2025 11:30
@Rbb666
Copy link
Member

Rbb666 commented Jan 6, 2025

@mysterywolf 麻烦再review下,谢谢

@mysterywolf
Copy link
Member

  1. ctrl_flags都改为flags
  2. RT_MTX_CTRL_FLAG_NO_RECUR 改为 RT_MUTEX_FLAG_NO_REC

@polarvid
Copy link
Contributor Author

polarvid commented Jan 8, 2025

如果不能给出可信理由,作者不会给出进一步修改了。多谢。

Copy link
Member

@mysterywolf mysterywolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.rt_err_t rt_mutex_init(rt_mutex_t mutex, const char *name, rt_uint8_t flag);
这个接口定义已经很久了,无需修改名字,而且ctrl_flag和flag并无本质区别
2. MTX这个缩写在RT-Thread中没有用到,现在同时出现了MTX和MUTEX两种拼写的宏,会让人很困惑,我第一次看到这个词的时候也是想了一下才反应过来是MUTEX
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Kernel PR has src relate code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants