fix: recorrect wrong fstat data layout for riscv and aarch64

Author: ken4647

api/ruxos_posix_api/src/imp/fd_ops.rs

@@ -26,7 +26,7 @@ impl From<ctypes::timespec> for RuxTimeSpec {
 }
 
 impl From<ctypes::stat> for RuxStat {
-    #[cfg(target_arch = "aarch64")]
+    #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
     fn from(cstat: ctypes::stat) -> Self {
         RuxStat {
             st_dev: cstat.st_dev,
@@ -48,7 +48,7 @@ impl From<ctypes::stat> for RuxStat {
         }
     }
 
-    #[cfg(any(target_arch = "x86_64", target_arch = "riscv64"))]
+    #[cfg(target_arch = "x86_64")]
     fn from(cstat: ctypes::stat) -> Self {
         RuxStat {
             st_dev: cstat.st_dev,
@@ -80,7 +80,7 @@ impl From<RuxTimeSpec> for ctypes::timespec {
 }
 
 impl From<RuxStat> for ctypes::stat {
-    #[cfg(target_arch = "aarch64")]
+    #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
     fn from(rstat: RuxStat) -> Self {
         ctypes::stat {
             st_dev: rstat.st_dev,
@@ -102,7 +102,7 @@ impl From<RuxStat> for ctypes::stat {
         }
     }
 
-    #[cfg(any(target_arch = "x86_64", target_arch = "riscv64"))]
+    #[cfg(target_arch = "x86_64")]
     fn from(rstat: RuxStat) -> Self {
         ctypes::stat {
             st_dev: rstat.st_dev,

api/ruxos_posix_api/src/imp/fs.rs

@@ -257,6 +257,12 @@ pub unsafe fn sys_newfstatat(
         }
         let node = fops::lookup(&path)?;
         let st = RuxStat::from(node.get_attr()?);
+
+        // TODO: remove this initialization when fields are fully implemented
+        unsafe {
+            core::ptr::write_bytes(kst, 0, 1);
+        }
+
         unsafe {
             (*kst).st_dev = st.st_dev;
             (*kst).st_ino = st.st_ino;

modules/ruxfdtable/src/lib.rs

@@ -178,7 +178,7 @@ pub struct RuxTimeSpec {
 }
 
 ///Rust version for struct stat in ctypes. Represents file status information.
-#[cfg(target_arch = "aarch64")]
+#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
 #[derive(Default)]
 pub struct RuxStat {
     /// Device identifier.
@@ -200,7 +200,7 @@ pub struct RuxStat {
     /// Total size, in bytes.
     pub st_size: i64,
     /// Block size for filesystem I/O.
-    pub st_blksize: core::ffi::c_long,
+    pub st_blksize: core::ffi::c_int,
     /// Padding to maintain alignment.
     pub __pad2: core::ffi::c_int,
     /// Number of 512B blocks allocated.
@@ -216,7 +216,7 @@ pub struct RuxStat {
 }
 
 ///Rust version for struct stat in ctypes. Represents file status information.
-#[cfg(any(target_arch = "x86_64", target_arch = "riscv64"))]
+#[cfg(target_arch = "x86_64")]
 #[derive(Default)]
 pub struct RuxStat {
     /// Device identifier.
@@ -251,7 +251,7 @@ pub struct RuxStat {
     pub __unused: [core::ffi::c_long; 3usize],
 }
 
-#[cfg(target_arch = "aarch64")]
+#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
 impl From<VfsNodeAttr> for RuxStat {
     fn from(attr: VfsNodeAttr) -> Self {
         Self {
@@ -284,7 +284,7 @@ impl From<VfsNodeAttr> for RuxStat {
     }
 }
 
-#[cfg(any(target_arch = "x86_64", target_arch = "riscv64"))]
+#[cfg(target_arch = "x86_64")]
 impl From<VfsNodeAttr> for RuxStat {
     fn from(attr: VfsNodeAttr) -> Self {
         Self {

ulib/include/sys/stat.h

@@ -14,7 +14,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(__riscv__) || defined(__riscv)
 struct stat {
 	dev_t st_dev;
 	ino_t st_ino;
@@ -55,50 +55,50 @@ struct stat {
 };
 #endif
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(__riscv__) || defined(__riscv)
 struct kstat {
-    dev_t st_dev;
-    ino_t st_ino;
-    mode_t st_mode;
-    nlink_t st_nlink;
-    uid_t st_uid;
-    gid_t st_gid;
-    dev_t st_rdev;
-    unsigned long __pad;
-    off_t st_size;
-    blksize_t st_blksize;
-    int __pad2;
-    blkcnt_t st_blocks;
-    long st_atime_sec;
-    long st_atime_nsec;
-    long st_mtime_sec;
-    long st_mtime_nsec;
-    long st_ctime_sec;
-    long st_ctime_nsec;
-    unsigned __unused[2];
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	unsigned long __pad;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __pad2;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
 };
-#else
+#elif defined(__x86_64__)
 struct kstat {
-    dev_t st_dev;
-    ino_t st_ino;
-    nlink_t st_nlink;
-
-    mode_t st_mode;
-    uid_t st_uid;
-    gid_t st_gid;
-    unsigned int __pad0;
-    dev_t st_rdev;
-    off_t st_size;
-    blksize_t st_blksize;
-    blkcnt_t st_blocks;
-
-    long st_atime_sec;
-    long st_atime_nsec;
-    long st_mtime_sec;
-    long st_mtime_nsec;
-    long st_ctime_sec;
-    long st_ctime_nsec;
-    long __unused[3];
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned int    __pad0;
+	dev_t st_rdev;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	long __unused[3];
 };
 #endif
 

ulib/include/sys/types.h

@@ -21,16 +21,22 @@ typedef unsigned long u_long, ulong;
 
 typedef unsigned mode_t;
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(__riscv__) || defined(__riscv)
 typedef uint32_t nlink_t;
 #else
 typedef uint64_t nlink_t;
 #endif
 
+// reference: /ulib/ruxmusl/musl-1.2.3/arch/aarch64/bits/alltypes.h.in
+#if defined(__aarch64__) || defined(__riscv__) || defined(__riscv)
+typedef int blksize_t;
+#else
+typedef long blksize_t;
+#endif
+
 typedef int64_t off_t;
 typedef uint64_t ino_t;
 typedef uint64_t dev_t;
-typedef long blksize_t;
 typedef int64_t blkcnt_t;
 
 typedef unsigned id_t;