Skip to content

[components][sdio] 修复 SDIO 驱动注销时的内存泄漏 - #11806

Open
Huoyanlifusu wants to merge 1 commit into
RT-Thread:masterfrom
Huoyanlifusu:fix/sdio-remove-driver
Open

Huoyanlifusu wants to merge 1 commit into
RT-Thread:masterfrom
Huoyanlifusu:fix/sdio-remove-driver

Conversation

@Huoyanlifusu

@Huoyanlifusu Huoyanlifusu commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

…tion

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

[

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

sdio_register_driver() 会为驱动分配并保存一个注册节点。原来的注销逻辑只有在找到匹配的 SDIO 卡时才释放该节点;设备上没有 SDIO 卡或没有匹配卡时,节点不会释放,反复注册、注销会造成内存泄漏。

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

找到待注销的驱动后,无论当前是否存在匹配的 SDIO 卡,都从驱动链表移除并释放注册节点。只有找到匹配卡时才调用驱动的 remove() 回调,保持原有设备解绑流程不变。

使用 QEMU VExpress-A9 验证了以下场景:

  • 连续注册、注销 256 次,内存占用没有增长;
  • 注册两个驱动后分别注销,链表操作正常;
  • 注销未注册的驱动会返回错误,不会崩溃;
  • 重复注销同一个驱动会返回错误,不会重复释放。
QEMU 临时验证用例

下面是本次实际运行的 MSH 测试代码,不是仓库原有 UTest:(AI 辅助生成)

#include <finsh.h>
#include <rtdevice.h>
#include <rtthread.h>

static rt_int32_t test_probe(struct rt_mmcsd_card *card)
{
    RT_UNUSED(card);
    return RT_EOK;
}

static rt_int32_t test_remove(struct rt_mmcsd_card *card)
{
    RT_UNUSED(card);
    return RT_EOK;
}

static struct rt_sdio_device_id test_id =
{
    .func_code = SDIO_ANY_FUNC_ID,
    .manufacturer = SDIO_ANY_MAN_ID,
    .product = SDIO_ANY_PROD_ID,
};

static struct rt_sdio_driver driver_a =
{
    .name = "sdio-test-a",
    .probe = test_probe,
    .remove = test_remove,
    .id = &test_id,
};

static struct rt_sdio_driver driver_b =
{
    .name = "sdio-test-b",
    .probe = test_probe,
    .remove = test_remove,
    .id = &test_id,
};

static int check_ret(const char *name, int actual, int expected)
{
    if (actual == expected)
        return RT_EOK;

    rt_kprintf("FAIL %s: expected=%d actual=%d\n",
            name, expected, actual);
    return -RT_ERROR;
}

static int sdio_unreg_test(void)
{
    rt_size_t used_before;
    rt_size_t used_after;
    int i;

    rt_memory_info(RT_NULL, &used_before, RT_NULL);
    for (i = 0; i < 256; i++)
    {
        if (check_ret("loop register", sdio_register_driver(&driver_a),
                    -RT_EEMPTY) != RT_EOK ||
                check_ret("loop unregister",
                    sdio_unregister_driver(&driver_a), RT_EOK) != RT_EOK)
            return -RT_ERROR;
    }
    rt_memory_info(RT_NULL, &used_after, RT_NULL);
    if (used_before != used_after)
    {
        rt_kprintf("FAIL loop heap: before=%u after=%u\n",
                (unsigned int)used_before, (unsigned int)used_after);
        return -RT_ERROR;
    }

    rt_memory_info(RT_NULL, &used_before, RT_NULL);
    if (check_ret("multi register A", sdio_register_driver(&driver_a),
                -RT_EEMPTY) != RT_EOK ||
            check_ret("multi register B", sdio_register_driver(&driver_b),
                -RT_EEMPTY) != RT_EOK ||
            check_ret("multi unregister A", sdio_unregister_driver(&driver_a),
                RT_EOK) != RT_EOK ||
            check_ret("multi unregister B", sdio_unregister_driver(&driver_b),
                RT_EOK) != RT_EOK)
        return -RT_ERROR;
    rt_memory_info(RT_NULL, &used_after, RT_NULL);
    if (used_before != used_after)
    {
        rt_kprintf("FAIL multi heap: before=%u after=%u\n",
                (unsigned int)used_before, (unsigned int)used_after);
        return -RT_ERROR;
    }

    if (check_ret("missing register A", sdio_register_driver(&driver_a),
                -RT_EEMPTY) != RT_EOK ||
            check_ret("missing unregister B",
                sdio_unregister_driver(&driver_b), -RT_ERROR) != RT_EOK ||
            check_ret("missing cleanup A", sdio_unregister_driver(&driver_a),
                RT_EOK) != RT_EOK)
        return -RT_ERROR;

    if (check_ret("double register A", sdio_register_driver(&driver_a),
                -RT_EEMPTY) != RT_EOK ||
            check_ret("double unregister A", sdio_unregister_driver(&driver_a),
                RT_EOK) != RT_EOK ||
            check_ret("double unregister A again",
                sdio_unregister_driver(&driver_a), -RT_ERROR) != RT_EOK)
        return -RT_ERROR;

    rt_kprintf("PASS: loop=256 heap_delta=0, multi=PASS, "
            "missing=PASS, double=PASS\n");
    return RT_EOK;
}
MSH_CMD_EXPORT(sdio_unreg_test, validate SDIO driver unregistration);

运行结果:

PASS: loop=256 heap_delta=0, multi=PASS, missing=PASS, double=PASS

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

  • BSP: bsp/qemu-vexpress-a9
  • .config: CONFIG_RT_USING_SDIO=yCONFIG_RT_USING_MEMTRACE=y
  • 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/sdio-remove-driver
    Enter PR branch fix/sdio-remove-driver 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/sdio-remove-driver 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/sdio-remove-driver 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!

@github-actions

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/drivers/sdio/dev_sdio.c

📊 Current Review Status (Last Updated: 2026-09-17 10:01 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.

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