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

[DFS_V1]修复 dfs_file_stat 一个 FATFS 根目录会失败的问题 #7940

Merged
merged 2 commits into from
Aug 20, 2023

Conversation

WKJay
Copy link
Contributor

@WKJay WKJay commented Aug 10, 2023

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

[

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

在使用 ART-PI BSP 时发现启用 sdcard 文件系统后在终端输入 ls 会有如下显示:
image
sdcard 目录被识别成了 BAD file。实际上此时 cd sdcard 是正常可以进入的。并且内部的文件都能够正常查看。而且这个问题似乎是最近才出现的。

经排查发现这个问题是由这个PR引入的:
#7887

该PR中删除了 dfs_file.c 中对当前是否是根目录的判断,导致无论是否是根目录都会进入 fs->ops->stat 的调用,进而调用到 f_stat,然而在目前版本的 FATFS 的 f_stat 在发现当前是根目录时会返回一个 FR_INVALID_NAME 的错误导致最终目录信息获取失败。

FRESULT f_stat (
    const TCHAR* path,	/* Pointer to the file path */
    FILINFO* fno		/* Pointer to file information to return */
)
{
    FRESULT res;
    DIR dj;
    DEF_NAMBUF


    /* Get logical drive */
    res = mount_volume(&path, &dj.obj.fs, 0);
    if (res == FR_OK) {
        INIT_NAMBUF(dj.obj.fs);
        res = follow_path(&dj, path);	/* Follow the file path */
        if (res == FR_OK) {				/* Follow completed */
------->    if (dj.fn[NSFLAG] & NS_NONAME) {	/* It is origin directory */
                res = FR_INVALID_NAME;
            } else {							/* Found an object */
                if (fno) get_fileinfo(&dj, fno);
            }
        }
        FREE_NAMBUF();
    }

    LEAVE_FF(dj.obj.fs, res);
}

目前不是很清楚 #7887 在这方面的修改是否有必要的,如果有必要的话可能需要讨论一下上述问题的正确解决方案

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

恢复之前 dfs_file_stat 中对根目录的单独处理逻辑

在什么测试环境下测试通过 (what is the test environment)

ART-PI

]

当前拉取/合并请求的状态 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

@geniusgogo
Copy link
Contributor

去/dev目录下ls看看呢?

@WKJay
Copy link
Contributor Author

WKJay commented Aug 18, 2023

去/dev目录下ls看看呢?

/dev 下 ls 没有问题:
image

看了一下 devfs.c 下的 dfs_device_fs_stat 是有根目录判断的

int dfs_device_fs_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
{
    /* stat root directory */
    if ((path[0] == '/') && (path[1] == '\0'))
    {
        st->st_dev = 0;

        st->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH |
                      S_IWUSR | S_IWGRP | S_IWOTH;
        st->st_mode &= ~S_IFREG;
        st->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;

        st->st_size  = 0;
        st->st_mtime = 0;

        return RT_EOK;
    }
    else
    {
        rt_device_t dev_id;

        dev_id = rt_device_find(&path[1]);
        if (dev_id != RT_NULL)
        {
            st->st_dev = 0;

            st->st_mode = S_IRUSR | S_IRGRP | S_IROTH |
                          S_IWUSR | S_IWGRP | S_IWOTH;

            if (dev_id->type == RT_Device_Class_Char)
                st->st_mode |= S_IFCHR;
            else if (dev_id->type == RT_Device_Class_Block)
                st->st_mode |= S_IFBLK;
            else if (dev_id->type == RT_Device_Class_Pipe)
                st->st_mode |= S_IFIFO;
            else if (dev_id->type == RT_Device_Class_Bus)
                st->st_mode |= S_IFDIR;
            else
                st->st_mode |= S_IFREG;

            st->st_size  = 0;
            st->st_mtime = 0;

            return RT_EOK;
        }
    }

    return -ENOENT;
}

@XYZ-20240101
Copy link
Contributor

这个问题对比了一下 dfs v2 那边是修改了 f_stat 函数中的代码,这边建议按照 v2 这边一样做修改来解决这个问题

image

@WKJay
Copy link
Contributor Author

WKJay commented Aug 18, 2023

这个问题对比了一下 dfs v2 那边是修改了 f_stat 函数中的代码,这边建议按照 v2 这边一样做修改来解决这个问题

image

@yangfasheng @geniusgogo @BernardXiong 这样改是可以的,但是我看最新的 fatfs 源码这部分并没有做改变,也就是说这样改以后 RTT 的 elmfat 就和 fatfs 官方不同步了,而且如果后面有其他文件系统支持的话有几率都要进行这部分的修改。如果没问题的话我就这么改。

@BernardXiong
Copy link
Member

这个问题对比了一下 dfs v2 那边是修改了 f_stat 函数中的代码,这边建议按照 v2 这边一样做修改来解决这个问题
image

@yangfasheng @geniusgogo @BernardXiong 这样改是可以的,但是我看最新的 fatfs 源码这部分并没有做改变,也就是说这样改以后 RTT 的 elmfat 就和 fatfs 官方不同步了,而且如果后面有其他文件系统支持的话有几率都要进行这部分的修改。如果没问题的话我就这么改。

先这样修改吧,未来还确实不确定能否和elm fatfs那边保持同步

@WKJay
Copy link
Contributor Author

WKJay commented Aug 18, 2023

先这样修改吧,未来还确实不确定能否和elm fatfs那边保持同步

@BernardXiong
已完成修改

@BernardXiong BernardXiong merged commit 166c83f into RT-Thread:master Aug 20, 2023
@mysterywolf
Copy link
Member

这处入侵式修改得用小本本记下来

supperthomas added a commit to supperthomas/rt-thread that referenced this pull request Aug 21, 2023
* [bsp][rt-spark] Update README.md

* [ci][action] add the repo check for self-use

* [bsp][stm32] add B-U585I-IOT02A BSP (RT-Thread#7778)

B-U585I-IOT02A芯片为STM32U585AIIxQ,与stm32u575-st-nucleo板卡接近,因此参考stm32u575-st-nucleo对B-U585I-IOT02A板卡的BSP进行了实现

* [bsp][Infineon] Add I2C4 config for psoc6-evaluationkit

* [SAL/SOCKET]修复在 RT_DEBUG 开启后,调用 closesocket 接口触发断言的 BUG

* 【dd2.0】Support the Core API for dd2.0 (RT-Thread#7791)

* [libcpu]fix RT_ASSERT undefine (RT-Thread#7816)

* [components][i2c] 优化 controt 接口格式,增加可用命令 (RT-Thread#7806)

原来 rt_i2c_control 只能执行 RT_I2C_DEV_CTRL_CLK 单一命令,通过此修改可以支持更多可用命令

* [libcpu][cortex-a]modified start_gcc.S (RT-Thread#7810)

* AArch64: fixup fpu storage's size in stack and append Q16 ~ Q31 (RT-Thread#7815)

Signed-off-by: GuEe-GUI <GuEe-GUI@github.com>

* [time]时钟框架重构 (RT-Thread#7794)

* [libcpu][arc]修复arc架构线程切换bug (RT-Thread#7825)

* [add] add msp432e401y-LaunchPad BSP v0.1

* [bsp][Infineon]fix i2c init error (RT-Thread#7817)

添加iic4的配置,将初始化错误断言部分修改为打印方式

* [github] Add the code_owner review quest

* [component/lwp] support more feature of signal from IEEE Std 1003.1-2017 (RT-Thread#7828)

Signed-off-by: Shell <smokewood@qq.com>

* [bsp][stm32][airm2m]<pin>更新pin num命令 (RT-Thread#7390)

* [components][net][sal][socket] Fix duplicate free on allocated buffer

- Avoid duplicate free as the d->vnode will be freed in the fd_release API call

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* ✨ feat(ktime): add RT_USING_KTIME to kconfig build

* [github] coder reviewer change

* overflow is invalid in oneshot mode

* [libc][time] cleanup code

* [smart] fix possible memory leak (RT-Thread#7832)

Signed-off-by: Shell <smokewood@qq.com>

* [debug] 整理debug宏并增加RT_DEBUGING_CONTEXT (RT-Thread#7805)

* clean up rtthread.h (RT-Thread#7843)

* [ci] add paths-ignore for format and static check (RT-Thread#7845)

* [ci] update code owner (RT-Thread#7846)

* modify some function prototypes of the dfs_file_ops structure and the function declarations based on it (RT-Thread#7849)

* [tools][mdk] fix .uvoptx/uvopt project name

e.g. scons --target=mdk5/4 --project-path='test'
will generate the test.uvoptx/uvopt file correctly

* [tools] --project-name= can use name with space

* [doc][env] update env document

* [smart] 修复用户态 mq_receive 不能阻塞 (RT-Thread#7836)

* [bsp][esp32-c3] Realization of scons compilation of ESP32-C3 | 实现ESP32-C3的scons编译 (RT-Thread#7821)

Co-authored-by: Supper Thomas <78900636@qq.com>

* [libcpu/arm] fix race condition with ldrex,strex (RT-Thread#7842)

Signed-off-by: Shell <smokewood@qq.com>

* 更新瑞萨相关 bsp (RT-Thread#7858)

* AArch64: fixup HW atomic_t ops type from dword to qword (RT-Thread#7861)

Signed-off-by: GuEe-GUI <GuEe-GUI@github.com>

* [smart] fix the setup of fake lwp in sys_execve (RT-Thread#7855)

* AArch64: support public linker scripts (RT-Thread#7831)

Signed-off-by: GuEe-GUI <GuEe-GUI@github.com>

* [bsp][wch] fix UART IRQ declarion 

将UART4后的中断函数声明改为UART

* [docs][qemu] update quick_start_qemu_windows

* [codeowners] add /documentation owners

* [doc][qemu] update qemu for windows doc

* [debug] fix the error when disable RT_USING_DEBUG

* 【dd2.0】move the core header files to include/drivers/core

* 🐞 fix(ktime): fix wrong boottime

因为tick从中断到设置中间的时延特别大,因此暂不采用tick做基准时间,直接取gtime的cnt做基准时间

* 🐞 fix(rtc/soft_rtc): fix wrong time

use boottime as soft_rtc time source

* 🐞 fix(ktime/hrtimer): fix ctrl c

* 📃 docs(ktime/readme): add readme

* [dfs v2]fix fcntl(F_SETFL) bug,and modify the error code when opening… (RT-Thread#7878)

* [syscall][socket]fix socket addr bug (RT-Thread#7876)

* Add the system call eventfd (RT-Thread#7835)

* [debug] use LOG_D instead RT_DEBUG_LOG

related: RT-Thread#7799

* [drivers/core] revise the macros of header files

the macros is too common to use so that to avoid conflicts

* [drivers/ipc] fix the recursive including if legacy enabled

* [ci][kconfig][qemu] guard the legacy option

* [.github] add CONTRIBUTING.md

https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors

* [docs] add env vscode document

* [bsp][pico]add: drv_spi and drv_i2c

* [components/ctime] fix the free of rt_work (RT-Thread#7882)

Signed-off-by: Shell <smokewood@qq.com>

* [libcpu/Kconfig] add ARCH_ARM_CORTEX_M23 define (RT-Thread#7895)

* [components][fal] remove some assert.

* [components][utilities][var_export] update the var export auto init to board_init.

* [sdio]开启emmc内部cache加快传输 (RT-Thread#7896)

* Add the system call epoll (RT-Thread#7893)

* [RTduino][stm32-f401nucleo] 支持对接引脚的功能切换 (RT-Thread#7901)

* Prepare some api for DM (RT-Thread#7894)

Signed-off-by: GuEe-GUI <GuEe-GUI@github.com>

* [bsp] phytium e2000 update (RT-Thread#7900)

Co-authored-by: zhugengyu <zhugengyu@phytium.com.cn>

* update dfs (RT-Thread#7887)

* [bsp][renesas]update ra6m3&4 readme

* [lwp] 修复错误码误用 (RT-Thread#7906)

* [DFS_V1] 修复close失败后不释放fd导致内存被永久占用且无法释放 (RT-Thread#7907)

* [components][drivers][sdio] Fix minor issue in sdio driver (RT-Thread#7904)

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* [smart] Fix bugs on lwp kill (RT-Thread#7892)

Signed-off-by: Shell <smokewood@qq.com>

* Add fops for dfs_v2 and rt_set_errno (RT-Thread#7910)

* [kernel][mutex] 去除mutex中的递归

* [bsp][stm32][drv_spi.c] remove meaningless settings

* [bsp][Phytium] qspi debug (RT-Thread#7914)

* [ci] add the manual trigger;add the fail bsp check (RT-Thread#7919)

* [rtduino][stm32-f401] support timer9 as tone timer

* [rtduino][stm32-l476] add LED_BUILTIN

* [bsp][stm32h750_artpi] use gnu99

* fix some variables not used warnings when build. (RT-Thread#7925)

* update components & lwp. (RT-Thread#7888)

* avoid warning message of sequence-point

board/ports/touch/gt911/src/gt911.c: warning: operation on '*(config + 8)' may be undefined [-Wsequence-point]
                config[8] = config[8] ^= (1 << 3);
                ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~

* [libc][time] silence the incorrect type warning

* rt_hw_cpu_reset: remove all other rt_weak

* rt_hw_cpu_shutdown: implement default weak function

and remvoe duplicated default functions in each cpu/bsp level

* [libcpu][risc-v][common] Avoid using t0 before being saved

- Fixed the issue that t0 was modified unexpectedly before being saved

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* [stm32][pandora] fix LCD init ahead PWM

* [SAL] fix the IPv4&v6 compiling issue. (RT-Thread#7938)

* [bsp/ifx] add cyw43012 wifi module

* [libcpu][risc-v][common] Fix application crash on risc-v soc if FPU is
enabled

- Defined ARCH_RISCV_FPU once the __riscv_flen macro was detected

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* fix dfs_file_open error code (RT-Thread#7942)

* fix mkdir error code. (RT-Thread#7944)

* fix lwp_free tty switch to foreground error (RT-Thread#7945)

* [libc][timezone] implement lightweith timezone configuration

* [device][rtc] support output UTC minutes level

* [libc][time] pre-support fully version timezone and daylight saving time

* [bsp][stm32][rt-spark] 更新 cubemx ports

* [bsp][hpmicro] Update libraries, add new BSPs

- Updated hpm_sdk in libraries
- Updated rt-thread driver adapter
- Updated bsp for hpm6750evkmini
- Updated bsp for hpm6750evk
- Added bsp for hpm6750evk2
- Added bsp for hpm6300evk
- Added bsp for hpm6200evk

Signed-off-by: Fan YANG <fan.yang@hpmicro.com>

* fix msh exec permission denied (RT-Thread#7943)

* 🎈 perf(ktime): perf hrtimer, del wrong function (RT-Thread#7880)

* [components/mm] add unmap page API (RT-Thread#7834)

Signed-off-by: Shell <smokewood@qq.com>

* [libc][posix/io/stdio] rename libc.c as posix/stdio.c

* [libc][newlib] __sdidinit is obselete

related:
RT-Thread#7923
mirror/newlib-cygwin@44b60f0

Co-authored-by: Meco Man <920369182@qq.com>

* [components][drivers][can]Init can tx completion flag before tx

* [DFS_V1]修复 dfs_file_stat 一个 FATFS 根目录会失败的问题 (RT-Thread#7940)

* fix list_page (RT-Thread#7968)

* [bsp][gd32]添加 立创开发板 GD32F470 的 SDRAM驱动,从STM32的drv_sdram.c修改而来

* [tools][gcc] remove legacy functions
- GenerateGCCConfig
- GenCconfigFile

* [tools] add GetGCCLikePLATFORM
GCC like means the toolchains which are compatible with GCC

* [ci] Add more config for future use

---------

Signed-off-by: GuEe-GUI <GuEe-GUI@github.com>
Signed-off-by: Shell <smokewood@qq.com>
Signed-off-by: Fan YANG <fan.yang@hpmicro.com>
Co-authored-by: Zheng-Bicheng <58363586+Zheng-Bicheng@users.noreply.github.com>
Co-authored-by: Siwei Xu <xusiwei1236@qq.com>
Co-authored-by: yanghaiyong <yanghaiyong@rt-thread.com>
Co-authored-by: ErikChanHub <33407169+ErikChanHub@users.noreply.github.com>
Co-authored-by: sp-cai <70000077+sp-cai@users.noreply.github.com>
Co-authored-by: lepus <lepustse@gmail.com>
Co-authored-by: GUI <39894654+GuEe-GUI@users.noreply.github.com>
Co-authored-by: xqyjlj <xqyjlj@126.com>
Co-authored-by: yby <115077689+yby-oy@users.noreply.github.com>
Co-authored-by: yby <1632443748@qq.com>
Co-authored-by: Rbb666 <64397326+Rbb666@users.noreply.github.com>
Co-authored-by: Shell <smokewood@qq.com>
Co-authored-by: wangqinglin <53550140+HelloByeAll@users.noreply.github.com>
Co-authored-by: Fan YANG <fan.yang@hpmicro.com>
Co-authored-by: Mr.M <64891884+martin-calvin@users.noreply.github.com>
Co-authored-by: Meco Man <920369182@qq.com>
Co-authored-by: xiao-mang <53597406+xiao-mang@users.noreply.github.com>
Co-authored-by: zhkag <zhkag@foxmail.com>
Co-authored-by: WCX <timwcx@qq.com>
Co-authored-by: guo <guozhanxin@rt-thread.com>
Co-authored-by: bxhsiman <64024208+bxhsiman@users.noreply.github.com>
Co-authored-by: erikchan <1043490933@qq.com>
Co-authored-by: Tennn11 <88527847+Tennn11@users.noreply.github.com>
Co-authored-by: zmq810150896 <50894086+zmq810150896@users.noreply.github.com>
Co-authored-by: Shicheng Chu <1468559561@qq.com>
Co-authored-by: 朱天龙 (Armink) <armink.ztl@gmail.com>
Co-authored-by: heyuanjie87 <sc943313837@gmail.com>
Co-authored-by: liYangYang <941843540@qq.com>
Co-authored-by: zhangyan <103986797+messigogogo@users.noreply.github.com>
Co-authored-by: zhugengyu <zhugengyu@phytium.com.cn>
Co-authored-by: geniusgogo <2041245+geniusgogo@users.noreply.github.com>
Co-authored-by: Rbb666 <zhangbingru@rt-thread.com>
Co-authored-by: Junjie Wang <34395906+WKJay@users.noreply.github.com>
Co-authored-by: Fan Yang <93824713+helloeagleyang@users.noreply.github.com>
Co-authored-by: vacabun <maguotong66@gmail.com>
Co-authored-by: DingDing <newflydd@gmail.com>
Co-authored-by: KunYi Chen <kunyi.chen@gmail.com>
Co-authored-by: cx <1253176313@qq.com>
Co-authored-by: Bernard Xiong <bernard.xiong@gmail.com>
Co-authored-by: FragrantRye <903465575@qq.com>
Co-authored-by: cmbjxxiao <48663789+cmbjxxiao@users.noreply.github.com>
Co-authored-by: yuanzihao <y@yzh.email>
@xiao-mang xiao-mang mentioned this pull request Oct 26, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants