Skip to content

[components][dfs]Split F_GETFL/F_SETFL from RT_DEVICE_CTRL_* via args… - #11869

Open
CXSforHPU wants to merge 1 commit into
RT-Thread:masterfrom
CXSforHPU:fix_5769
Open

CXSforHPU wants to merge 1 commit into
RT-Thread:masterfrom
CXSforHPU:fix_5769

Conversation

@CXSforHPU

Copy link
Copy Markdown
Contributor

… nullness

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

[

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

F_GETFL (=3) 在数值上与 RT_DEVICE_CTRL_CONFIG (=3) 撞码,F_SETFL (=4) 与 RT_DEVICE_CTRL_CLOSE (=4) 撞码。两套 cmd 共享同一个 int 参数,POSIX 路径下(fcntl → dfs_file_ioctl / dfs_file_fcntl → fops->ioctl)会被 driver 误解释。

具体表现:

  • dfs_v1 的 FT_REGULAR/FT_DEVICE vnode 在 dfs_file_ioctl 内已经拦截 F_GETFL/F_SETFL,但 FT_SOCKET 仍会 fall-through;dfs_v2 的 dfs_file_ioctl 是 fops 的纯 passthrough,没有任何拦截,串口等 driver 在 LWP 关闭时会把 F_GETFL 误当成 RT_DEVICE_CTRL_CONFIG 实际重配硬件。
  • 应用层用 POSIX fcntl 调用 RT-Thread device control cmd 时被静默截胡,无法到达 driver。

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

利用 POSIX 与 RT-Thread 在两个 cmd 上对 args 参数的互补要求做 disambiguator,无需改动 cmd 编码:

cmd POSIX 语义(args 形态) RT-Thread 语义(args 形态) args == NULL 意为
3 F_GETFL 忽略 args(恒 NULL) CONFIG 必带 struct * POSIX F_GETFL
4 F_SETFL 带 int flags(非 NULL) CLOSE 不需要 args(NULL) RTT CLOSE

改动文件:

  • components/dfs/dfs_v1/src/dfs_file.c::dfs_file_ioctl
    • case F_GETFL: args != NULL && fops->ioctl → 转发 driver(RTT CONFIG);否则返回 fd->flags(POSIX)。
    • case F_SETFL: args == NULL && fops->ioctl → 转发 driver(RTT CLOSE);否则改 fd->flags(POSIX)。
  • components/dfs/dfs_v2/src/dfs_file.c::dfs_file_fcntl
    • F_GETFL/F_SETFL 分支按相同镜像逻辑改造,保留原 socket 通知路径(FT_SOCKET 仍调 fops->ioctl(file, F_SETFL, …) 更新 sock->flags)。

角落场景:fcntl(fd, F_SETFL, 0) 与 rt_device_control(dev, RT_DEVICE_CTRL_CLOSE, NULL) 在 variadic 协议下位模式相同,无法稳定判别。文档建议避免 F_SETFL(0),需要清非阻塞时用 fcntl(fd, F_SETFL, fd->flags & ~O_NONBLOCK)。

请提供验证的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
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 fix_5769
    Enter PR branch fix_5769 in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 fix_5769 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix_5769 branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@CXSforHPU

Copy link
Copy Markdown
Contributor Author

#5073
尝试解决该issue

@CXSforHPU
CXSforHPU marked this pull request as draft October 15, 2026 16:57
@github-actions

github-actions Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/dfs/dfs_v1/src/dfs_file.c
  • components/dfs/dfs_v2/src/dfs_file.c

📊 Current Review Status (Last Updated: 2026-10-16 01:23 CST)


📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@CXSforHPU
CXSforHPU marked this pull request as ready for review October 15, 2026 17:03
@github-actions

github-actions Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

MemBrowse Memory Report

k230

  • SRAM: .eh_frame -8 B (-0.0%, 1,128,531 B / 268,300,288 B, total: 0% used)

simulator

  • Code: .rela.dyn +3,456 B, .rodata +544 B, .text +1,764 B (+0.2%, 2,678,784 B)
  • Data: .data +4,096 B (+0.3%, 1,613,380 B)

x86

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant