Add VDSO functionality under the riscv64 architecture.

components/lwp/SConscript

@@ -25,11 +25,14 @@ if platform in platform_file.keys(): # support platforms
     if arch in support_arch.keys() and cpu in support_arch[arch]:
         asm_path = 'arch/' + arch + '/' + cpu + '/*_' + platform_file[platform]
         arch_common = 'arch/' + arch + '/' + 'common/*.c'
+        common = 'arch/common/*.c'
         if not GetDepend('RT_USING_VDSO'):
             vdso_files = ['vdso_data.c', 'vdso.c']
             src += [f for f in Glob(arch_common) if os.path.basename(str(f)) not in vdso_files]
+            src += [f for f in Glob(common) if os.path.basename(str(f)) not in vdso_files]
         else:
             src += Glob(arch_common)
+            src += Glob(common)
         if not GetDepend('ARCH_MM_MMU'):
             excluded_files = ['ioremap.c', 'lwp_futex.c', 'lwp_mm_area.c', 'lwp_pmutex.c', 'lwp_shm.c', 'lwp_user_mm.c']
             src += [f for f in Glob('*.c') if os.path.basename(str(f)) not in excluded_files] + Glob(asm_path)

components/lwp/arch/aarch64/common/vdso.c → components/lwp/arch/common/vdso.c

@@ -1,77 +1,82 @@
 /*
- * Copyright (c) 2006-2024 RT-Thread Development Team
+ * Copyright (c) 2006-2025 RT-Thread Development Team
  *
  * 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.
  */
 
 #include <rtthread.h>
 #include <mmu.h>
-#include <gtimer.h>
 #include <lwp_user_mm.h>
 
 #include "vdso.h"
 #include "vdso_datapage.h"
-#define DBG_TAG    "vdso"
-#define DBG_LVL    DBG_INFO
+#define DBG_TAG "vdso"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
-enum vdso_abi {
-    VDSO_ABI_AA64,
+enum vdso_abi
+{
+    VDSO_ABI_COMMON,
 };
-enum vvar_pages {
+
+enum vvar_pages
+{
     VVAR_DATA_PAGE_OFFSET,
     VVAR_TIMENS_PAGE_OFFSET,
     VVAR_NR_PAGES,
 };
-struct vdso_abi_info {
-    const char *name;
-    const char *vdso_code_start;
-    const char *vdso_code_end;
-    unsigned long vdso_pages;
 
+
+struct vdso_abi_info
+{
+    const char   *name;
+    const char   *vdso_code_start;
+    const char   *vdso_code_end;
+    unsigned long vdso_pages;
 };
 
 static struct vdso_abi_info vdso_info[] = {
-    [VDSO_ABI_AA64] = {
-        .name = "vdso_aarch64",
-        .vdso_code_start = __vdso_text_start,
-        .vdso_code_end = __vdso_text_end,
-    },
+    [VDSO_ABI_COMMON] = {
+                       .name            = "vdso_common",
+                       .vdso_code_start = __vdso_text_start,
+                       .vdso_code_end   = __vdso_text_end,
+                       },
 };
 
 static union {
-    struct vdso_data    data[CS_BASES];
-    uint8_t         page[ARCH_PAGE_SIZE];
+    struct vdso_data data[CS_BASES];
+    uint8_t          page[ARCH_PAGE_SIZE];
 } vdso_data_store __page_aligned_data;
-struct vdso_data *vdso_data = vdso_data_store.data;
-int init_ret_flag = RT_EOK;
+struct vdso_data *vdso_data     = vdso_data_store.data;
+int               init_ret_flag = RT_EOK;
 
 static int __setup_additional_pages(enum vdso_abi abi, struct rt_lwp *lwp)
 {
     RT_ASSERT(lwp != RT_NULL);
 
-    int ret;
-    void *vdso_base = RT_NULL;
+    int           ret;
+    void         *vdso_base = RT_NULL;
     unsigned long vdso_data_len, vdso_text_len;
 
     vdso_data_len = VVAR_NR_PAGES * ARCH_PAGE_SIZE;
     vdso_text_len = vdso_info[abi].vdso_pages << ARCH_PAGE_SHIFT;
 
     vdso_base = lwp_map_user_phy(lwp, RT_NULL, rt_kmem_v2p((void *)vdso_data), vdso_data_len, 0);
-    if(vdso_base != RT_NULL)
+    if (vdso_base != RT_NULL)
     {
         ret = RT_EOK;
     }
     else
     {
         ret = RT_ERROR;
     }
+
     vdso_base += vdso_data_len;
-    vdso_base = lwp_map_user_phy(lwp, vdso_base, rt_kmem_v2p((void *)vdso_info[abi].vdso_code_start), vdso_text_len, 0);
+    vdso_base  = lwp_map_user_phy(lwp, vdso_base, rt_kmem_v2p((void *)vdso_info[abi].vdso_code_start), vdso_text_len, 0);
 
     lwp->vdso_vbase = vdso_base;
     return ret;
@@ -81,28 +86,28 @@ int arch_setup_additional_pages(struct rt_lwp *lwp)
 {
     int ret;
     if (init_ret_flag != RT_EOK) return -RT_ERROR;
-    ret = __setup_additional_pages(VDSO_ABI_AA64, lwp);
+    ret = __setup_additional_pages(VDSO_ABI_COMMON, lwp);
 
     return ret;
 }
 
+
 static void __initdata(void)
 {
-    struct tm time_vdso = SOFT_RTC_VDSOTIME_DEFAULT;
+    struct tm time_vdso          = SOFT_RTC_VDSOTIME_DEFAULT;
     vdso_data->realtime_initdata = timegm(&time_vdso);
 }
 
+
 static int validate_vdso_elf(void)
 {
-    if (rt_memcmp(vdso_info[VDSO_ABI_AA64].vdso_code_start, ELF_HEAD, ELF_HEAD_LEN)) {
+    if (rt_memcmp(vdso_info[VDSO_ABI_COMMON].vdso_code_start, ELF_HEAD, ELF_HEAD_LEN))
+    {
         LOG_E("vDSO is not a valid ELF object!");
         init_ret_flag = -RT_ERROR;
         return -RT_ERROR;
     }
-    vdso_info[VDSO_ABI_AA64].vdso_pages = (
-        vdso_info[VDSO_ABI_AA64].vdso_code_end -
-        vdso_info[VDSO_ABI_AA64].vdso_code_start) >>
-        ARCH_PAGE_SHIFT;
+    vdso_info[VDSO_ABI_COMMON].vdso_pages = (vdso_info[VDSO_ABI_COMMON].vdso_code_end - vdso_info[VDSO_ABI_COMMON].vdso_code_start) >> ARCH_PAGE_SHIFT;
 
     __initdata();
     return RT_EOK;

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

@@ -10,19 +10,19 @@
 
 typedef struct
 {
-    Elf64_Word st_name;
-    Elf64_Addr st_value;
-    Elf64_Word st_size;
+    Elf64_Word    st_name;
+    Elf64_Addr    st_value;
+    Elf64_Word    st_size;
     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)
 {
     size_t rel_off;
-    void* addr;
+    void  *addr;
 
     if (rel_dyn_size && !dynsym)
     {
@@ -40,26 +40,26 @@ void arch_elf_reloc(rt_aspace_t aspace, void *text_start, void *rel_dyn_start, s
         addr = rt_hw_mmu_v2p(aspace, (void *)((rt_size_t)text_start + v1));
         if ((v2 & 0xff) == R_ARM_RELATIVE)
         {
-            *(rt_size_t*)addr += (rt_size_t)text_start;
+            *(rt_size_t *)addr += (rt_size_t)text_start;
         }
         else if ((v2 & 0xff) == R_ARM_ABS32)
         {
             uint32_t t;
             t = (v2 >> 8);
             if (t) /* 0 is UDF */
             {
-                *(rt_size_t*)addr = (((rt_size_t)text_start) + dynsym[t].st_value);
+                *(rt_size_t *)addr = (((rt_size_t)text_start) + dynsym[t].st_value);
             }
         }
     }
     /* modify got */
     if (got_size)
     {
-        uint32_t *got_item = (uint32_t*)got_start;
+        uint32_t *got_item = (uint32_t *)got_start;
 
         for (rel_off = 0; rel_off < got_size; rel_off += 4, got_item++)
         {
-            addr = rt_hw_mmu_v2p(aspace, got_item);
+            addr                = rt_hw_mmu_v2p(aspace, got_item);
             *(rt_size_t *)addr += (rt_size_t)text_start;
         }
     }
@@ -83,22 +83,22 @@ void arch_elf_reloc(void *text_start, void *rel_dyn_start, size_t rel_dyn_size,
 
         if ((v2 & 0xff) == R_ARM_RELATIVE)
         {
-            *(uint32_t*)(((rt_size_t)text_start) + v1) += (uint32_t)text_start;
+            *(uint32_t *)(((rt_size_t)text_start) + v1) += (uint32_t)text_start;
         }
         else if ((v2 & 0xff) == R_ARM_ABS32)
         {
             uint32_t t;
             t = (v2 >> 8);
             if (t) /* 0 is UDF */
             {
-                *(uint32_t*)(((rt_size_t)text_start) + v1) = (uint32_t)(((rt_size_t)text_start) + dynsym[t].st_value);
+                *(uint32_t *)(((rt_size_t)text_start) + v1) = (uint32_t)(((rt_size_t)text_start) + dynsym[t].st_value);
             }
         }
     }
     /* modify got */
     if (got_size)
     {
-        uint32_t *got_item = (uint32_t*)got_start;
+        uint32_t *got_item = (uint32_t *)got_start;
 
         for (rel_off = 0; rel_off < got_size; rel_off += 4, got_item++)
         {

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2025 RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2025-04-22     ScuDays        Add VDSO functionality under the riscv64 architecture.
+ */
+
+#include <rtthread.h>
+#include <ktime.h>
+#include <time.h>
+#include <vdso_datapage.h>
+#include <vdso_data.h>
+#include <encoding.h>
+
+void rt_vdso_update_glob_time(void)
+{
+    struct vdso_data *vdata = get_k_vdso_data();
+    struct timespec  *vdso_ts;
+    uint64_t          initdata = vdata->realtime_initdata;
+    rt_vdso_write_begin(vdata);
+
+    vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_REALTIME];
+    rt_ktime_boottime_get_ns(vdso_ts);
+    vdso_ts->tv_sec = initdata + vdso_ts->tv_sec;
+
+    vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC];
+    rt_ktime_boottime_get_ns(vdso_ts);
+
+    vdata->cycle_last = rdtime();
+    rt_vdso_write_end(vdata);
+}

components/lwp/vdso/Kconfig

@@ -1,4 +1,4 @@
 menuconfig RT_USING_VDSO
     bool "vDSO"
     default y
-    depends on RT_USING_SMART && ARCH_ARMV8
+    depends on RT_USING_SMART && (ARCH_ARMV8 || ARCH_RISCV)

components/lwp/vdso/SConscript

@@ -12,7 +12,7 @@ CPPPATH = [cwd, cwd + "/kernel"]
 if not GetDepend(['RT_USING_VDSO']):
     Return('group')
 
-if rtconfig.ARCH != "aarch64":
+if rtconfig.ARCH != "aarch64" and rtconfig.ARCH != "risc-v":
     src = Glob('*.c')
     group = DefineGroup('VDSO', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
     Return('group')
@@ -21,15 +21,23 @@ 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])
+
+
+PREFIX  = rtconfig.PREFIX
+CPP = PREFIX + 'cpp'
+CPPFLAGS= ' -E -P -x assembler-with-cpp'
+rtconfig.CPP = CPP
+rtconfig.CPPFLAGS = CPPFLAGS
+
+if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"):
+    Preprocessing("user/arch/" + rtconfig.ARCH + "/vdso.lds.S", ".lds", CPPPATH=[cwd])
 
 #aarch64 vdso xmake
 # vdso_file = os.path.join(cwd, 'usr', 'xmake.lua')
 # command = ["xmake", "-F", vdso_file]
 # clean = ["xmake", "clean"]
 
-vdso_file = os.path.join(cwd, 'user', 'SConstruct')
+vdso_file = os.path.join(cwd, 'user',"arch", rtconfig.ARCH, 'SConstruct')
 command = ["scons", "-f", vdso_file]
 clean = ["scons", "-f", vdso_file, "--clean"]
 

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

@@ -4,7 +4,9 @@ import subprocess
 
 arguments = sys.argv[2]
 vdso_usr = os.path.dirname(arguments)
-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)
 
 
 EXEC_PATH  = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
@@ -22,8 +24,7 @@ CXXFLAGS = DEVICE + ' -Wall -fdiagnostics-color=always'
 AFLAGS   = ' -x assembler-with-cpp'
 CFLAGS  = DEVICE + ' -Wall -Wno-cpp -std=gnu99 -fdiagnostics-color=always -fPIC -O2'
 LFLAGS  = DEVICE + ' -Bsymbolic -Wl,--gc-sections,-u,system_vectors -T {path}/vdso.lds'.format(path=vdso_usr)
-CFLAGS += " -I {path} -I{path}/user".format(path=vdso_root)
-
+CFLAGS += " -I {path} -I {upath} ".format(path=vdso_usr ,upath=user_path)
 env = Environment(tools=['gcc', 'link'],
     AS   = AS,   ASFLAGS = AFLAGS,
     CC   = CC,   CFLAGS = CFLAGS,
@@ -34,6 +35,6 @@ env.PrependENVPath('PATH', EXEC_PATH)
 
 src = os.path.join(vdso_usr,'vdso_sys.c')
 target_name = 'librtos_vdso.so'
-target = os.path.join(vdso_usr, "build", target_name)
+target = os.path.join(user_path + "/user", "build", target_name)
 shared_lib = env.SharedLibrary(target=target, source=src)
 env.Default(shared_lib)

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

@@ -0,0 +1,42 @@
+import os
+import sys
+import subprocess
+
+arguments = sys.argv[2]
+vdso_usr = os.path.dirname(arguments)
+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, "../../../../../../"))
+include_path = os.path.join(rt_root_path, "include")
+rtconfig_path = os.path.join(rt_root_path, "bsp", "qemu-virt64-riscv")
+
+EXEC_PATH  = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
+PREFIX     = os.getenv('RTT_CC_PREFIX') or 'riscv64-unknown-linux-gnu-'
+
+CC      = PREFIX + 'gcc'
+CXX     = PREFIX + 'g++'
+CPP     = PREFIX + 'cpp'
+AS      = PREFIX + 'gcc'
+AR      = PREFIX + 'ar'
+LINK    = PREFIX + 'gcc'
+DEVICE   = ' -march=rv64imafdc -mabi=lp64'
+CXXFLAGS = DEVICE + ' -Wall -fdiagnostics-color=always -fPIC -O0 -g'
+AFLAGS   = ' -x assembler-with-cpp'
+CFLAGS  = DEVICE + ' -Wall -Wno-cpp -std=gnu99 -fdiagnostics-color=always -fPIC -O2'
+LFLAGS  = DEVICE + ' -Bsymbolic -Wl,--gc-sections -T {path}/vdso.lds'.format(path=vdso_usr)
+CFLAGS += " -I {path} -I {upath} -I {include_path} -I {rtconfig_path} ".format(path=vdso_usr, upath=user_path, include_path=include_path, rtconfig_path=rtconfig_path)
+
+env = Environment(tools=['gcc', 'link'],
+    AS   = AS,   ASFLAGS = AFLAGS,
+    CC   = CC,   CFLAGS = CFLAGS,
+    CXX  = CXX,  CXXFLAGS = CXXFLAGS,
+    AR   = AR,   
+    LINK = LINK, LINKFLAGS = LFLAGS)
+env.PrependENVPath('PATH', EXEC_PATH)
+
+src = os.path.join(vdso_usr,'vdso_sys.c')
+target_name = 'librtos_vdso.so'
+target = os.path.join(user_path + "/user", "build", target_name)
+shared_lib = env.SharedLibrary(target=target, source=src)
+env.Default(shared_lib)