[smart] code cleanup for vdso.

Author: BernardXiong

components/lwp/Kconfig

@@ -1,5 +1,5 @@
 menuconfig RT_USING_LWP
-    bool "light-weight process"
+    bool "lwP(light weight Process)"
     depends on RT_USING_SMART
     default y
     help
@@ -87,4 +87,3 @@ if RT_USING_LWP
 rsource "terminal/Kconfig"
 rsource "vdso/Kconfig"
 endif
-

components/lwp/vdso/Kconfig

@@ -1,4 +1,4 @@
-menuconfig RT_USING_VDSO
-    bool "vDSO"
+config RT_USING_VDSO
+    bool "vDSO (​​Virtual Dynamic Shared Object)"
+    depends on (ARCH_ARMV8 || ARCH_RISCV)
     default y
-    depends on RT_USING_SMART && (ARCH_ARMV8 || ARCH_RISCV)

components/lwp/vdso/SConscript

@@ -2,59 +2,49 @@ import os
 import rtconfig
 import subprocess
 from building import *
-Import('RTT_ROOT')
 
-group = []
-
-cwd = GetCurrentDir()
+group   = []
+cwd     = GetCurrentDir()
 CPPPATH = [cwd, cwd + "/kernel"]
+list    = os.listdir(cwd)
+src     = Glob('kernel/*.c') + Glob('kernel/*.S')
 
 if not GetDepend(['RT_USING_VDSO']):
     Return('group')
 
 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')
-
-list = os.listdir(cwd)
-src    = Glob('kernel/*.c')
-src    +=Glob('kernel/*.S')
-
-
-if not hasattr(rtconfig, 'CPP') or rtconfig.CPP is None:
-    rtconfig.CPP = rtconfig.PREFIX + 'cpp'
-if not hasattr(rtconfig, 'CPPFLAGS') or rtconfig.CPPFLAGS is None:
-    rtconfig.CPPFLAGS = ' -E -P -x assembler-with-cpp'
+    # not supported arch
+    src = []
+else:
+    if not hasattr(rtconfig, 'CPP') or rtconfig.CPP is None:
+        rtconfig.CPP = rtconfig.PREFIX + 'cpp'
+    if not hasattr(rtconfig, 'CPPFLAGS') or rtconfig.CPPFLAGS is None:
+        rtconfig.CPPFLAGS = ' -E -P -x assembler-with-cpp'
 
-if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"):
-    Preprocessing("user/arch/" + rtconfig.ARCH + "/vdso.lds.S", ".lds", CPPPATH=[cwd])
+    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',"arch", rtconfig.ARCH, 'SConstruct')
 
-vdso_file = os.path.join(cwd, 'user',"arch", rtconfig.ARCH, 'SConstruct')
+    process_env = os.environ.copy()
+    if hasattr(rtconfig, 'EXEC_PATH') and rtconfig.EXEC_PATH is not None:
+        process_env['EXEC_PATH'] = rtconfig.EXEC_PATH
+    if hasattr(rtconfig, 'PREFIX') and rtconfig.PREFIX is not None:
+        process_env['CC_PREFIX'] = rtconfig.PREFIX
 
-process_env = os.environ.copy()
-if hasattr(rtconfig, 'EXEC_PATH') and rtconfig.EXEC_PATH is not None:
-    process_env['EXEC_PATH'] = rtconfig.EXEC_PATH
-if hasattr(rtconfig, 'PREFIX') and rtconfig.PREFIX is not None:
-    process_env['CC_PREFIX'] = rtconfig.PREFIX
-command = ["scons", "-f", vdso_file]
-clean_command = ["scons", "-f", vdso_file, "--clean"] 
+    command = ["scons", "-f", vdso_file]
+    clean_command = ["scons", "-f", vdso_file, "--clean"] 
 
-if not GetOption('clean'):    
-    result = subprocess.run(command, env=process_env, check=True)
-else:
-    result = subprocess.run(clean_command, env=process_env, check=True)
+    if not GetOption('clean'):    
+        result = subprocess.run(command, env=process_env, check=True)
+    else:
+        result = subprocess.run(clean_command, env=process_env, check=True)
 
-if result.returncode == 0:
-    print("Command executed successfully")
-else:
-    print("Command failed with exit code:", result.returncode)
-    exit(1)
+    if result.returncode == 0:
+        print("Command executed successfully")
+    else:
+        print("Command failed with exit code:", result.returncode)
+        exit(1)
 
-group = DefineGroup('VDSO', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
+group = DefineGroup('vDSO', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH)
 Return('group')

components/lwp/vdso/kernel/vdso_text.S

@@ -8,7 +8,7 @@
  * 2024-07-04     rcitach        init ver.
  */
 
-#include <vdso_config.h>    
+#include <vdso_config.h>
 
     .globl __vdso_text_start, __vdso_text_end
     .section .rodata

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

@@ -1,40 +1,33 @@
 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)
+vdso_usr  = os.path.dirname(arguments)
+vdso_path = os.path.join(vdso_usr, '..', '..', '..')
 
-
-EXEC_PATH  = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
-PREFIX     = os.getenv('RTT_CC_PREFIX') or 'aarch64-none-elf-'
+EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
+PREFIX    = os.getenv('RTT_CC_PREFIX') or 'aarch64-none-elf-'
 
 CC      = PREFIX + 'gcc'
-CXX     = PREFIX + 'g++'
 CPP     = PREFIX + 'cpp'
 AS      = PREFIX + 'gcc'
 AR      = PREFIX + 'ar'
 LINK    = PREFIX + 'gcc'
 
-DEVICE   = ' -march=armv8-a -mtune=cortex-a53 -ftree-vectorize -ffast-math -funwind-tables -fno-strict-aliasing'
-CXXFLAGS = DEVICE + ' -Wall -fdiagnostics-color=always'
-AFLAGS   = ' -x assembler-with-cpp'
+DEVICE  = ' -march=armv8-a -mtune=cortex-a53 -ftree-vectorize -ffast-math -funwind-tables -fno-strict-aliasing'
+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 {upath} ".format(path=vdso_usr ,upath=user_path)
+CFLAGS += " -I . -I {vdso_path} ".format(vdso_path=vdso_path)
+
+src = Glob('*.c')
 env = Environment(tools=['gcc', 'link'],
     AS   = AS,   ASFLAGS = AFLAGS,
-    CC   = CC,   CFLAGS = CFLAGS,
-    CXX  = CXX,  CXXFLAGS = CXXFLAGS,
-    AR   = AR,   
+    CC   = CC,   CFLAGS  = CFLAGS,
+    CPP  = CPP,  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)
+target = os.path.join(vdso_path, 'user', 'build', 'libvdso.so')
 shared_lib = env.SharedLibrary(target=target, source=src)
 env.Default(shared_lib)

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

@@ -1,46 +1,33 @@
 import os
 import sys
-import subprocess
-from PIL.SpiderImagePlugin import iforms
 
 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")
+vdso_usr  = os.path.dirname(arguments)
+vdso_path = os.path.join(vdso_usr, '..', '..', '..')
+
+EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
+PREFIX    = os.getenv('RTT_CC_PREFIX') or 'aarch64-none-elf-'
 
-EXEC_PATH  = os.getenv('EXEC_PATH')
-if not EXEC_PATH:
-    EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
-PREFIX  = os.getenv('CC_PREFIX')
-if not PREFIX:
-    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'
+
+DEVICE  = ' -march=rv64imafdc -mabi=lp64'
+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)
+CFLAGS += " -I . -I {vdso_path} ".format(vdso_path=vdso_path)
 
+src = Glob('*.c')
 env = Environment(tools=['gcc', 'link'],
     AS   = AS,   ASFLAGS = AFLAGS,
     CC   = CC,   CFLAGS = CFLAGS,
-    CXX  = CXX,  CXXFLAGS = CXXFLAGS,
-    AR   = AR,   
+    CPP  = CPP,  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)
+target = os.path.join(vdso_path, 'user', 'build', 'libvdso.so')
 shared_lib = env.SharedLibrary(target=target, source=src)
 env.Default(shared_lib)

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

@@ -6,12 +6,14 @@
  * Change Logs:
  * Date           Author         Notes
  * 2025-04-22     ScuDays        Add VDSO functionality under the riscv64 architecture.
+ * 2025-05-10     Bernard        Move __arch_get_hw_frq() to vdso_sys.c as a weak function.
  */
 
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
 #include <stdbool.h>
+
 #include <vdso_sys.h>
 
 #ifndef rt_vdso_cycles_ready
@@ -22,6 +24,12 @@ static inline bool rt_vdso_cycles_ready(uint64_t cycles)
 #endif
 
 #ifndef rt_vdso_get_ns
+/* Implement as a weak function because there is no CPU cycle for RISCV */
+__attribute__((weak)) uint64_t __arch_get_hw_frq()
+{
+    return 10000000;
+}
+
 static inline uint64_t rt_vdso_get_ns(uint64_t cycles, uint64_t last)
 {
     return (cycles - last) * NSEC_PER_SEC / __arch_get_hw_frq();

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

@@ -14,9 +14,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
+
 #include <vdso_config.h>
 #include <vdso_datapage.h>
-#include <rtcompiler.h>
 
 #define __always_unused __attribute__((__unused__))
 #define __maybe_unused  __attribute__((__unused__))
@@ -34,11 +34,6 @@ static inline uint64_t __arch_get_hw_counter()
     arch_counter_enforce_ordering;
     return res;
 }
-// 使用了rt_weak弱符号标记该函数，默认为10000000，请根据对应平台实现这个函数。
-rt_weak inline uint64_t __arch_get_hw_frq()
-{
-    return 10000000;
-}
 
 static inline uint32_t
 __iter_div_u64_rem(uint64_t dividend, uint32_t divisor, uint64_t *remainder)

components/lwp/vdso/vdso_config.h

@@ -15,11 +15,11 @@
 extern "C" {
 #endif
 
-#define __VVAR_PAGES    2
+#define __VVAR_PAGES        2
 #define VDSO_PAGE_SHIFT     12
 #define VDSO_PAGE_SIZE      (1 << VDSO_PAGE_SHIFT)
 
-#define BIT_MASK(nr)         ((1) << (nr))
+#define BIT_MASK(nr)        ((1) << (nr))
 
 #ifndef read_barrier_depends
 #define read_barrier_depends()      do { } while (0)
@@ -29,7 +29,7 @@ extern "C" {
 #define smp_read_barrier_depends()  read_barrier_depends()
 #endif
 
-#define VDSO_PATH "../user/build/librtos_vdso.so"
+#define VDSO_PATH "../user/build/libvdso.so"
 
 #ifdef __cplusplus
 }

components/lwp/vdso/vdso_weak.c

@@ -19,5 +19,5 @@ rt_weak int arch_setup_additional_pages(struct rt_lwp *lwp)
 
 rt_weak void rt_vdso_update_glob_time(void)
 {
-
+    return ;
 }