[DM/PIC] Fixup SMP CPU mask list when CPU < 4 #10998
Conversation
Signed-off-by: GuEe-GUI <2991707448@qq.com>
|
👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。 🛠 操作步骤 | Steps
完成后，提交将自动更新至 如有问题欢迎联系我们，再次感谢您的贡献！💐 |
📌 Code Review Assignment🏷️ Tag: componentsReviewers: @Maihuanyi Changed Files (Click to expand)
📊 Current Review Status (Last Updated: 2025-12-01 17:14 CST)
📝 Review Instructions
|
There was a problem hiding this comment.
Pull request overview
This PR attempts to fix the display formatting of the SMP CPU mask list in the interrupt information output when the system has fewer than 4 CPUs. The changes ensure the column width is at least 4 characters for better visual alignment.
Key Changes:
- Modified the column width calculation for the "CPUs" header to use a minimum of 4 characters
- Added padding logic to fill unused CPU positions with spaces when CPU count is less than 4
| if (RT_CPUS_NR < 4) | ||
| { | ||
| rt_memset(&cpumask[RT_CPUS_NR], ' ', 4 - RT_CPUS_NR); | ||
| } |
There was a problem hiding this comment.
Buffer Overflow Risk / 缓冲区溢出风险
English: This code will cause a buffer overflow when RT_CPUS_NR < 4. The cpumask buffer is declared on line 1183 with size RT_CPUS_NR + 1. When RT_CPUS_NR = 2, for example, the buffer has only 3 bytes (indices 0, 1, 2), but this code writes to cpumask[2] and cpumask[3], accessing out-of-bounds memory.
中文：当 RT_CPUS_NR < 4 时，此代码会导致缓冲区溢出。cpumask 缓冲区在第 1183 行声明，大小为 RT_CPUS_NR + 1。例如，当 RT_CPUS_NR = 2 时，缓冲区只有 3 字节（索引 0、1、2），但此代码会写入 cpumask[2] 和 cpumask[3]，访问越界内存。
Solution / 解决方案:
Change the buffer declaration to accommodate the minimum display width:
static char cpumask[rt_max(RT_CPUS_NR, 4) + 1] = { [rt_max(RT_CPUS_NR, 4)] = '\0' };Or use a fixed size buffer:
static char cpumask[5] = { [4] = '\0' }; // 4 chars + null terminator| 12, "Mode", | ||
| #ifdef RT_USING_SMP | ||
| RT_CPUS_NR, "CPUs", | ||
| rt_max(RT_CPUS_NR, 4), "CPUs", |
There was a problem hiding this comment.
PR Title Format / PR 标题格式
English: PR title should follow lowercase format [module][subsystem] according to RT-Thread guidelines. Current title uses uppercase [DM/PIC], but should be [drivers][pic] or [pic] in lowercase.
中文：根据 RT-Thread 指南，PR 标题应遵循小写格式 [模块][子系统]。当前标题使用大写 [DM/PIC]，应改为小写的 [drivers][pic] 或 [pic]。
Suggested title / 建议标题:
[drivers][pic] Fixup SMP CPU mask list when CPU < 4
or
[pic] Fix SMP CPU mask buffer display for systems with less than 4 CPUs
The size of cpumask is `RT_CPUS_NR`, memset force to space will overflow in stack. Signed-off-by: GuEe-GUI <2991707448@qq.com>
2 participants
拉取/合并请求描述：(PR description)
[
Fixup SMP CPU mask list when CPU < 4
]
当前拉取/合并请求的状态 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