From 02a939586657ee8e9eaf63b4afe76a847e1583c8 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Wed, 18 Sep 2024 14:50:18 -0700 Subject: [PATCH 1/6] Add support for Trusty OS targets --- src/lib.rs | 6 +++ src/trusty.rs | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/trusty.rs diff --git a/src/lib.rs b/src/lib.rs index 1fe44ce6eef08..015b17594545f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -110,6 +110,12 @@ cfg_if! { mod teeos; pub use teeos::*; + } else if #[cfg(target_os = "trusty")] { + mod fixed_width_ints; + pub use fixed_width_ints::*; + + mod trusty; + pub use trusty::*; } else if #[cfg(all(target_env = "sgx", target_vendor = "fortanix"))] { mod fixed_width_ints; pub use fixed_width_ints::*; diff --git a/src/trusty.rs b/src/trusty.rs new file mode 100644 index 0000000000000..e9e3895fdb059 --- /dev/null +++ b/src/trusty.rs @@ -0,0 +1,101 @@ +#[cfg(feature = "trusty_sys")] +extern crate trusty_sys; + +pub use core::ffi::c_void; + +#[cfg(feature = "trusty_sys")] +pub const PROT_READ: i32 = self::trusty_sys::MMAP_FLAG_PROT_READ as i32; + +#[cfg(feature = "trusty_sys")] +pub const PROT_WRITE: i32 = self::trusty_sys::MMAP_FLAG_PROT_WRITE as i32; + +pub type size_t = usize; +pub type ssize_t = isize; + +pub type off_t = i64; + +#[cfg(any(target_arch = "aarch64", target_arch = "arm"))] +pub type c_char = u8; +#[cfg(target_arch = "x86_64")] +pub type c_char = i8; + +pub type c_schar = i8; +pub type c_uchar = u8; +pub type c_short = i16; +pub type c_ushort = u16; +pub type c_int = i32; +pub type c_uint = u32; + +#[cfg(target_pointer_width = "32")] +pub type c_long = i32; +#[cfg(target_pointer_width = "64")] +pub type c_long = i64; + +#[cfg(target_pointer_width = "32")] +pub type c_ulong = u32; +#[cfg(target_pointer_width = "64")] +pub type c_ulong = u64; + +pub type c_longlong = i64; +pub type c_ulonglong = u64; + +pub type c_uint8_t = u8; +pub type c_uint16_t = u16; +pub type c_uint32_t = u32; +pub type c_uint64_t = u64; + +pub type c_int8_t = i8; +pub type c_int16_t = i16; +pub type c_int32_t = i32; +pub type c_int64_t = i64; + +pub type time_t = c_long; + +pub type clockid_t = c_int; +pub const CLOCK_REALTIME: clockid_t = 0; + +s! { + pub struct timespec { + pub tv_sec: time_t, + pub tv_nsec: c_long, + } +} + +pub const STDOUT_FILENO: ::c_int = 1; +pub const STDERR_FILENO: ::c_int = 2; + +pub const AT_PAGESZ: ::c_ulong = 6; + +pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void; + +extern "C" { + pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void; + pub fn malloc(size: size_t) -> *mut c_void; + pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void; + pub fn free(p: *mut c_void); + pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void; + pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int; + pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t; + pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t; + pub fn close(fd: ::c_int) -> ::c_int; + pub fn strlen(cs: *const c_char) -> size_t; + pub fn getauxval(type_: c_ulong) -> c_ulong; + pub fn mmap( + addr: *mut ::c_void, + len: ::size_t, + prot: ::c_int, + flags: ::c_int, + fd: ::c_int, + offset: off_t, + ) -> *mut ::c_void; + pub fn munmap(addr: *mut ::c_void, len: ::size_t) -> ::c_int; + pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int; + pub fn nanosleep(rqtp: *const ::timespec, rmtp: *mut ::timespec) -> ::c_int; +} + +s! { + pub struct iovec { + pub iov_base: *mut ::c_void, + pub iov_len: ::size_t, + } +} From 95b7e5c0e0bf38ca113876bf76eccc9aa1168565 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Mon, 23 Sep 2024 11:52:11 -0700 Subject: [PATCH 2/6] Fix formatting of `trusty.rs` --- src/trusty.rs | 53 ++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/src/trusty.rs b/src/trusty.rs index e9e3895fdb059..e8c1f3aabbe0e 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -1,23 +1,17 @@ -#[cfg(feature = "trusty_sys")] -extern crate trusty_sys; - pub use core::ffi::c_void; -#[cfg(feature = "trusty_sys")] -pub const PROT_READ: i32 = self::trusty_sys::MMAP_FLAG_PROT_READ as i32; - -#[cfg(feature = "trusty_sys")] -pub const PROT_WRITE: i32 = self::trusty_sys::MMAP_FLAG_PROT_WRITE as i32; - pub type size_t = usize; pub type ssize_t = isize; pub type off_t = i64; -#[cfg(any(target_arch = "aarch64", target_arch = "arm"))] -pub type c_char = u8; -#[cfg(target_arch = "x86_64")] -pub type c_char = i8; +cfg_if! { + if #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] { + pub type c_char = u8; + } else if #[cfg(target_arch = "x86_64")] { + pub type c_char = i8; + } +} pub type c_schar = i8; pub type c_uchar = u8; @@ -26,15 +20,15 @@ pub type c_ushort = u16; pub type c_int = i32; pub type c_uint = u32; -#[cfg(target_pointer_width = "32")] -pub type c_long = i32; -#[cfg(target_pointer_width = "64")] -pub type c_long = i64; - -#[cfg(target_pointer_width = "32")] -pub type c_ulong = u32; -#[cfg(target_pointer_width = "64")] -pub type c_ulong = u64; +cfg_if! { + if #[cfg(target_pointer_width = "32")] { + pub type c_long = i32; + pub type c_ulong = u32; + } else if #[cfg(target_pointer_width = "64")] { + pub type c_long = i64; + pub type c_ulong = u64; + } +} pub type c_longlong = i64; pub type c_ulonglong = u64; @@ -52,15 +46,21 @@ pub type c_int64_t = i64; pub type time_t = c_long; pub type clockid_t = c_int; -pub const CLOCK_REALTIME: clockid_t = 0; s! { + pub struct iovec { + pub iov_base: *mut ::c_void, + pub iov_len: ::size_t, + } + pub struct timespec { pub tv_sec: time_t, pub tv_nsec: c_long, } } +pub const CLOCK_REALTIME: clockid_t = 0; + pub const STDOUT_FILENO: ::c_int = 1; pub const STDERR_FILENO: ::c_int = 2; @@ -92,10 +92,3 @@ extern "C" { pub fn clock_gettime(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int; pub fn nanosleep(rqtp: *const ::timespec, rmtp: *mut ::timespec) -> ::c_int; } - -s! { - pub struct iovec { - pub iov_base: *mut ::c_void, - pub iov_len: ::size_t, - } -} From 93e4d7a775fbb7ba020b5b27e7405ff614c780b3 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Tue, 24 Sep 2024 09:50:48 -0700 Subject: [PATCH 3/6] Add semver vile for trusty --- libc-test/semver/trusty.txt | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 libc-test/semver/trusty.txt diff --git a/libc-test/semver/trusty.txt b/libc-test/semver/trusty.txt new file mode 100644 index 0000000000000..428a91daed8e0 --- /dev/null +++ b/libc-test/semver/trusty.txt @@ -0,0 +1,47 @@ +AT_PAGESZ +CLOCK_REALTIME +MAP_FAILED +STDERR_FILENO +STDOUT_FILENO +calloc +clockid_t +clock_gettime +close +c_char +c_int +c_int16_t +c_int32_t +c_int64_t +c_int8_t +c_long +c_longlong +c_schar +c_short +c_uchar +c_uint +c_uint16_t +c_uint32_t +c_uint64_t +c_uint8_t +c_ulong +c_ulonglong +c_ushort +c_void +free +getauxval +iovec +malloc +memalign +mmap +munmap +nanosleep +off_t +posix_memalign +realloc +size_t +ssize_t +strlen +timespec +time_t +write +writev From 6ae1987d3433fd42be3e229521bf3e42168c34c7 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Tue, 24 Sep 2024 09:55:54 -0700 Subject: [PATCH 4/6] Add `PROT_READ` and `PROT_WRITE` for trusty --- libc-test/semver/trusty.txt | 2 ++ src/trusty.rs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/libc-test/semver/trusty.txt b/libc-test/semver/trusty.txt index 428a91daed8e0..0c79d05701095 100644 --- a/libc-test/semver/trusty.txt +++ b/libc-test/semver/trusty.txt @@ -1,6 +1,8 @@ AT_PAGESZ CLOCK_REALTIME MAP_FAILED +PROT_READ +PROT_WRITE STDERR_FILENO STDOUT_FILENO calloc diff --git a/src/trusty.rs b/src/trusty.rs index e8c1f3aabbe0e..4e2b9593aa4d9 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -59,6 +59,9 @@ s! { } } +pub const PROT_READ: i32 = 1; +pub const PROT_WRITE: i32 = 2; + pub const CLOCK_REALTIME: clockid_t = 0; pub const STDOUT_FILENO: ::c_int = 1; From ea1a0459f9c5083d725fccd7369aefc1ebb3f983 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Mon, 7 Oct 2024 14:55:09 -0700 Subject: [PATCH 5/6] Replace `CLOCK_REALTIME` with `CLOCK_BOOTTIME` --- src/trusty.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/trusty.rs b/src/trusty.rs index 4e2b9593aa4d9..3dc9e8f8e81bb 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -62,7 +62,8 @@ s! { pub const PROT_READ: i32 = 1; pub const PROT_WRITE: i32 = 2; -pub const CLOCK_REALTIME: clockid_t = 0; +// Trusty only supports `CLOCK_BOOTTIME`. +pub const CLOCK_BOOTTIME: clockid_t = 7; pub const STDOUT_FILENO: ::c_int = 1; pub const STDERR_FILENO: ::c_int = 2; From b348da8f1e636a9c314a826e2517439466066595 Mon Sep 17 00:00:00 2001 From: Nicole LeGare Date: Mon, 21 Oct 2024 12:37:55 -0700 Subject: [PATCH 6/6] Add `c_float` and `c_double` --- src/trusty.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/trusty.rs b/src/trusty.rs index 3dc9e8f8e81bb..68b13f70b5b3f 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -43,6 +43,9 @@ pub type c_int16_t = i16; pub type c_int32_t = i32; pub type c_int64_t = i64; +pub type c_float = f32; +pub type c_double = f64; + pub type time_t = c_long; pub type clockid_t = c_int;