Add VDSO functionality under the riscv64 architecture. #10219

ScuDays · 2025-04-23T02:40:36Z

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

[

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

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

请提供验证的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
如果是新增bsp, 已经添加ci检查到.github/workflows/bsp_buildings.yml 详细请参考链接BSP自查

CLAassistant · 2025-04-23T02:40:42Z

All committers have signed the CLA.

BernardXiong · 2025-04-24T00:49:51Z

components/lwp/vdso/user/arch/risc-v/SConstruct

+user_path = os.path.dirname(vdso_usr)
+user_path = os.path.dirname(user_path)
+user_path = os.path.dirname(user_path)
+rt_root_path = os.path.abspath(os.path.join(vdso_usr, "../../../../../../")) # 获取根目录绝对路径


移除中文注释吧

unicornx

我对 rtt 上 vdso 的设计不是很熟，简单 review 一下，提了几个问题请回答一下。

另外我想问一下目前 rtt 的 vdso 是不是只支持了 clock_gettime 这一个系统调用？

另外这个 pr 是怎么测试的，请描述一下。测试结果如何？

unicornx · 2025-04-24T06:06:25Z

components/lwp/vdso/SConscript

@@ -21,15 +21,17 @@ list = os.listdir(cwd)
 src    = Glob('kernel/*.c')
 src    +=Glob('kernel/*.S')

-if not os.path.exists(cwd + "/user/vdso.lds"):
-    Preprocessing("user/vdso.lds.S", ".lds", CPPPATH=[cwd])
+print(rtconfig.CPP)


删掉多余的打印

unicornx · 2025-04-24T06:06:40Z

components/lwp/vdso/SConscript

-    Preprocessing("user/vdso.lds.S", ".lds", CPPPATH=[cwd])
+print(rtconfig.CPP)
+if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"):
+    print("/user" + "/arch/"+ rtconfig.ARCH + "/vdso.lds.S")


删掉多余的打印

unicornx · 2025-04-24T06:07:36Z

bsp/qemu-virt64-riscv/rtconfig.py

@@ -33,6 +34,7 @@
    OBJCPY  = PREFIX + 'objcopy'

    DEVICE  = ' -mcmodel=medany -march=rv64imafdc -mabi=lp64 '
+    CPPFLAGS= ' -E -P -x assembler-with-cpp'


请问这个文件中加这个 CPPFLAGS 和 CPP 的目的是什么？

而且这个 pr 为啥会涉及对 bsp 的改动?

已删除。

unicornx · 2025-04-24T06:10:29Z

components/lwp/arch/risc-v/common/reloc.c

    unsigned char st_info;
    unsigned char st_other;
-    Elf64_Half st_shndx;
+    Elf64_Half    st_shndx;
 } Elf64_sym;

 #ifdef ARCH_MM_MMU
 void arch_elf_reloc(rt_aspace_t aspace, void *text_start, void *rel_dyn_start, size_t rel_dyn_size, void *got_start, size_t got_size, Elf64_sym *dynsym)
 {


arch_elf_reloc 这个函数在哪里被调用的，没发现调用的地方？

这个reloc.c文件是原本就有的，这个pr里面只修改了这个文件的位置，这个函数arch_elf_reloc 具体的调用我也不太清楚。

建议研究一下，即使不在这个 pr 里改，或许是个另外的问题，可以提 issue，在另外的 pr 里改。

unicornx · 2025-04-24T06:15:48Z

components/lwp/arch/risc-v/common/vdso.c

+{
+    int ret;
+    if (init_ret_flag != RT_EOK) return -RT_ERROR;
+    /* ret = __setup_additional_pages(VDSO_ABI_AA64, lwp); */


删除这行

unicornx · 2025-04-24T06:16:42Z

components/lwp/arch/risc-v/common/vdso.c

有个疑问，这个文件和 components/lwp/arch/aarch64/common/vdso.c 几乎一摸一样，是否可以考虑合并？

查看了一下确实可以进行合并。最新的commit中已经进行了合并。

unicornx · 2025-04-24T06:23:21Z

components/lwp/vdso/user/arch/risc-v/vdso_sys.h

+
+rt_weak inline uint64_t __arch_get_hw_frq()
+{
+    return 10000000;


这个值写死了，合适吗？

这个使用了rt_weak弱符号标记，根据对应平台实现这个函数就会覆盖这个实现，risc-v里面好像没有可以获取主频的寄存器，所以这里就写死了。

这里建议加入注释，说明下原因。

unicornx · 2025-04-24T06:23:46Z

components/lwp/vdso/user/xmake.lua

这个文件删除是没有用了吗？

后续移除xmake了

BernardXiong · 2025-04-24T09:32:28Z

我对 rtt 上 vdso 的设计不是很熟，简单 review 一下，提了几个问题请回答一下。

另外我想问一下目前 rtt 的 vdso 是不是只支持了 clock_gettime 这一个系统调用？

另外这个 pr 是怎么测试的，请描述一下。测试结果如何？

应该是之前这个接口用于做用户态性能测试，这个时候不用通过内核系统调用方式走，不会损失精度延迟

Copilot

Pull Request Overview

This PR adds VDSO functionality for the riscv64 architecture. Key changes include introducing new header and source files implementing VDSO syscalls and timekeeping functions for RISC-V, updating build configuration (SConstruct and SConscript) to support the new architecture, and adding common VDSO data and initialization routines.

Reviewed Changes

Copilot reviewed 11 out of 14 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
components/lwp/vdso/user/arch/risc-v/vdso_sys.h	New header with inline functions and macros for timekeeping and hardware counter access
components/lwp/vdso/user/arch/risc-v/vdso_sys.c	New source file implementing VDSO clock_gettime functions
components/lwp/vdso/user/arch/risc-v/SConstruct	Build script updates for RISC-V VDSO shared library generation
components/lwp/vdso/user/arch/aarch64/SConstruct	Adjustments in include paths to align with new directory structure
components/lwp/vdso/SConscript	Update to include riscv support in addition to aarch64
components/lwp/arch/risc-v/common/vdso_data.c	VDSO data update routine for the riscv64 platform
components/lwp/arch/risc-v/common/vdso.c	VDSO ELF validation and additional pages setup for VDSO

Files not reviewed (3)

components/lwp/vdso/Kconfig: Language not supported
components/lwp/vdso/user/arch/risc-v/vdso.lds.S: Language not supported
components/lwp/vdso/user/xmake.lua: Language not supported

Comments suppressed due to low confidence (1)

components/lwp/vdso/user/arch/risc-v/vdso_sys.c:48

The function __arch_get_hw_counter is defined without parameters in vdso_sys.h, but it is invoked with arguments here; update the call to match its signature or modify the function definition as needed.

cycles = __arch_get_hw_counter(vd->clock_mode, vd);

supperthomas · 2025-04-30T01:51:31Z

CI问题看下

Copilot

Pull Request Overview

This pull request adds VDSO functionality for the riscv64 architecture by introducing new header, source, and build configuration files.

Introduces new VDSO system header and implementation files for riscv64.
Updates SConstruct and SConscript files to integrate the riscv64 VDSO functionality.
Modifies common VDSO handling in the arch layer to support the new VDSO ABI.

Reviewed Changes

Copilot reviewed 12 out of 15 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
components/lwp/vdso/user/arch/risc-v/vdso_sys.h	New header file for riscv VDSO functionality with VDSO helper macros.
components/lwp/vdso/user/arch/risc-v/vdso_sys.c	New implementation file for riscv VDSO functions.
components/lwp/vdso/user/arch/risc-v/SConstruct	SCons build script adjustments for riscv VDSO.
components/lwp/vdso/user/arch/aarch64/SConstruct	Adjusted include paths for better consistency with user paths.
components/lwp/vdso/SConscript	Modified SConscript to incorporate architecture-specific VDSO files.
components/lwp/arch/risc-v/common/vdso_data.c	Added riscv support in the VDSO data update routine.
components/lwp/arch/common/vdso.c	Updated VDSO ABI references to support the new riscv VDSO addition.

Files not reviewed (3)

components/lwp/vdso/Kconfig: Language not supported
components/lwp/vdso/user/arch/risc-v/vdso.lds.S: Language not supported
components/lwp/vdso/user/xmake.lua: Language not supported

Copilot · 2025-05-06T06:26:39Z

components/lwp/vdso/user/arch/risc-v/vdso_sys.c

+
+    do {
+        seq    = rt_vdso_read_begin(vd);
+        cycles = __arch_get_hw_counter(vd->clock_mode, vd);


The function __arch_get_hw_counter is defined without parameters in the header, but is called with two arguments here. Adjust the call to use no parameters or update the function definition to accept the provided arguments.

BernardXiong

还请把这个PR处理好，谢谢

BernardXiong · 2025-05-08T03:01:40Z

components/lwp/arch/common/vdso.c

 *
 * SPDX-License-Identifier: Apache-2.0
 *
 * Change Logs:
 * Date           Author         Notes
- * 2024-07-04     rcitach        init ver.
+ * 2025-04-22     ScuDays        Add VDSO functionality under the riscv64 architecture.


这里挺奇怪的，为什么要改，而不是增加。

BernardXiong · 2025-05-08T03:03:21Z

components/lwp/vdso/user/arch/aarch64/SConstruct

-vdso_root = os.path.dirname(vdso_usr)
+user_path = os.path.dirname(vdso_usr)
+user_path = os.path.dirname(user_path)
+user_path = os.path.dirname(user_path)


为什么需要三个连续赋值？不一样的吗

已经修改，需要找到特定那一级目录。

BernardXiong · 2025-05-08T03:04:30Z

components/lwp/vdso/user/arch/risc-v/vdso_sys.h

+
+rt_weak inline uint64_t __arch_get_hw_frq()
+{
+    return 10000000;


这里建议加入注释，说明下原因。

BernardXiong · 2025-05-08T08:58:08Z

components/lwp/vdso/user/arch/risc-v/vdso_sys.h

+    arch_counter_enforce_ordering;
+    return res;
+}
+// 使用了rt_weak弱符号标记该函数，默认为10000000，请根据对应平台实现这个函数。


为什么是中文注释？代码中一般都尽可能使用英文。

BernardXiong · 2025-05-08T20:13:45Z

components/lwp/vdso/user/arch/risc-v/SConstruct

+import os
+import sys
+import subprocess
+from PIL.SpiderImagePlugin import iforms


什么情况的，为什么这里还会有PIL

BernardXiong · 2025-05-08T20:37:03Z

PR质量太差，后续重新整理。

ScuDays requested a review from BernardXiong as a code owner April 23, 2025 02:40

github-actions bot added BSP RT-Smart RT-Thread Smart related PR or issues component: lwp Component labels Apr 23, 2025

BernardXiong approved these changes Apr 23, 2025

View reviewed changes

BernardXiong requested a review from unicornx April 23, 2025 02:57

ScuDays force-pushed the master branch from d44ef7e to 033931b Compare April 23, 2025 05:37

ScuDays requested a review from BernardXiong April 23, 2025 05:40

BernardXiong approved these changes Apr 24, 2025

View reviewed changes

BernardXiong reviewed Apr 24, 2025

View reviewed changes

unicornx suggested changes Apr 24, 2025

View reviewed changes

ScuDays force-pushed the master branch 2 times, most recently from 5bab842 to 0693ee3 Compare April 27, 2025 03:12

supperthomas requested a review from Copilot April 27, 2025 03:32

Copilot AI reviewed Apr 27, 2025

View reviewed changes

Add VDSO functionality under the riscv64 architecture.

7f0131c

ScuDays force-pushed the master branch from 24c36fc to 7f0131c Compare April 27, 2025 06:47

修复components/lwp/vdso/SConscript依赖CPP和CPPFLAGS的问题

52c7674

修复当没有设置环境变量时scons -c出现的问题

a451d47

supperthomas requested a review from Copilot May 6, 2025 06:26

Copilot AI reviewed May 6, 2025

View reviewed changes

修复vdso中构建时候找不到gcc路径的问题

f0e716d

BernardXiong requested changes May 8, 2025

View reviewed changes

ScuDays and others added 3 commits May 8, 2025 13:40

修复CI问题

ca901cd

修复CI问题

6e6e481

Merge branch 'RT-Thread:master' into master

badcd88

尝试修复CI问题

22d801d

BernardXiong reviewed May 8, 2025

View reviewed changes

尝试修复k230找不到工具链的问题

98b3c68

BernardXiong reviewed May 8, 2025

View reviewed changes

BernardXiong closed this May 8, 2025

Add VDSO functionality under the riscv64 architecture. #10219

Add VDSO functionality under the riscv64 architecture. #10219

Uh oh!

Conversation

ScuDays commented Apr 23, 2025

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

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

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

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

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

代码质量 Code Quality：

Uh oh!

CLAassistant commented Apr 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

unicornx left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BernardXiong commented Apr 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

supperthomas commented Apr 30, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI May 6, 2025

Choose a reason for hiding this comment

Uh oh!

BernardXiong left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CLAassistant commented Apr 23, 2025 •

edited

Loading