Merge branch 'main' into guest-call-host-function-improvements

Author: dblnz

.devcontainer/Dockerfile

@@ -59,7 +59,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
     && rustup default ${RUST_TOOLCHAIN} \
     && rustup target add x86_64-unknown-linux-gnu \
     && rustup target add x86_64-unknown-none      \
-    && rustup target add x86_64-pc-windows-msvc   \
     && rustup toolchain add nightly-x86_64-unknown-linux-gnu \
     && cargo install just
 

README.md

@@ -177,13 +177,10 @@ After having an environment with a hypervisor setup, running the example has the
    Azure Linux, run `sudo dnf install build-essential`.
 2. [Rust](https://www.rust-lang.org/tools/install). Install toolchain v1.81 or later.
 
-   Also, install the `x86_64-pc-windows-msvc` and `x86_64-unknown-none` targets, these are needed to build the test
-   guest binaries. (Note: install both targets on either Linux or Windows: Hyperlight can load ELF or PE files on either
-   OS, and the tests/examples are built for both):
-
+   Also, install the `x86_64-unknown-none` target, it is needed to build the test
+   guest binaries.
     ```sh
     rustup target add x86_64-unknown-none
-    rustup target add x86_64-pc-windows-msvc
     ```
 
 3. [just](https://github.com/casey/just). `cargo install just` On Windows you also need [pwsh](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.4).

dev/verify-msrv.sh

@@ -6,10 +6,21 @@ for CRATE in "$@"; do
     if ! rustup toolchain list | grep -q "$VERSION"; then
         rustup --quiet toolchain install "$VERSION" --no-self-update --profile minimal
     fi
-    if cargo +$VERSION check --quiet -p $CRATE; then
-        echo -e " \u001b[1;32m✓\u001b[0m Crate \u001b[1m$CRATE\u001b[0m builds with rust \u001b[1m$VERSION\u001b[0m"
+    if [[ "$CRATE" == "hyperlight-guest" ]]; then
+        TARGET="x86_64-unknown-none"
+        rustup target add "$TARGET" --toolchain "$VERSION" >/dev/null
+        if cargo +"$VERSION" check --quiet -p "$CRATE" --target "$TARGET"; then
+            echo -e " \u001b[1;32m✓\u001b[0m Crate \u001b[1m$CRATE\u001b[0m builds with rust \u001b[1m$VERSION\u001b[0m and target \u001b[1m$TARGET\u001b[0m"
+        else
+            echo -e " \u001b[1;31m✗\u001b[0m Crate \u001b[1m$CRATE\u001b[0m fails with rust \u001b[1m$VERSION\u001b[0m and target \u001b[1m$TARGET\u001b[0m"
+            exit 1
+        fi
     else
-        echo -e " \u001b[1;31m✗\u001b[0m Crate \u001b[1m$CRATE\u001b[0m fails with rust \u001b[1m$VERSION\u001b[0m"
-        exit 1
+        if cargo +"$VERSION" check --quiet -p "$CRATE"; then
+            echo -e " \u001b[1;32m✓\u001b[0m Crate \u001b[1m$CRATE\u001b[0m builds with rust \u001b[1m$VERSION\u001b[0m"
+        else
+            echo -e " \u001b[1;31m✗\u001b[0m Crate \u001b[1m$CRATE\u001b[0m fails with rust \u001b[1m$VERSION\u001b[0m"
+            exit 1
+        fi
     fi
 done

src/hyperlight_guest/build.rs

@@ -121,7 +121,6 @@ fn cargo_main() {
         copy_includes(&include_dir, "third_party/printf/");
     }
     if cfg!(feature = "libc") {
-        copy_includes(&include_dir, "include");
         copy_includes(&include_dir, "third_party/musl/include");
         copy_includes(&include_dir, "third_party/musl/arch/generic");
         copy_includes(&include_dir, "third_party/musl/arch/x86_64");

src/hyperlight_guest/include/setjmp.h

@@ -22,12 +22,12 @@ use hyperlight_common::outb::OutBAction;
 use log::LevelFilter;
 use spin::Once;
 
-use crate::gdt::load_gdt;
+#[cfg(target_arch = "x86_64")]
+use crate::exceptions::{gdt::load_gdt, idtr::load_idt};
 use crate::guest_function_call::dispatch_function;
 use crate::guest_logger::init_logger;
 use crate::host_function_call::outb;
-use crate::idtr::load_idt;
-use crate::{__security_cookie, HEAP_ALLOCATOR, MIN_STACK_ADDRESS, OS_PAGE_SIZE, P_PEB};
+use crate::{HEAP_ALLOCATOR, MIN_STACK_ADDRESS, OS_PAGE_SIZE, P_PEB};
 
 #[inline(never)]
 pub fn halt() {
@@ -73,10 +73,8 @@ extern "C" {
 
 static INIT: Once = Once::new();
 
-// Note: entrypoint cannot currently have a stackframe >4KB, as that will invoke __chkstk on msvc
-//       target without first having setup global `RUNNING_MODE` variable, which __chkstk relies on.
 #[no_mangle]
-pub extern "win64" fn entrypoint(peb_address: u64, seed: u64, ops: u64, max_log_level: u64) {
+pub extern "C" fn entrypoint(peb_address: u64, seed: u64, ops: u64, max_log_level: u64) {
     if peb_address == 0 {
         panic!("PEB address is null");
     }
@@ -85,7 +83,6 @@ pub extern "win64" fn entrypoint(peb_address: u64, seed: u64, ops: u64, max_log_
         unsafe {
             P_PEB = Some(peb_address as *mut HyperlightPEB);
             let peb_ptr = P_PEB.unwrap();
-            __security_cookie = peb_address ^ seed;
 
             let srand_seed = ((peb_address << 8 ^ seed >> 4) >> 32) as u32;
 
@@ -103,9 +100,12 @@ pub extern "win64" fn entrypoint(peb_address: u64, seed: u64, ops: u64, max_log_
             // don't have to change the assembly code.
             MIN_STACK_ADDRESS = (*peb_ptr).gueststackData.minUserStackAddress;
 
-            // Setup GDT and IDT
-            load_gdt();
-            load_idt();
+            #[cfg(target_arch = "x86_64")]
+            {
+                // Setup GDT and IDT
+                load_gdt();
+                load_idt();
+            }
 
             let heap_start = (*peb_ptr).guestheapData.guestHeapBuffer as usize;
             let heap_size = (*peb_ptr).guestheapData.guestHeapSize as usize;

src/hyperlight_guest/src/chkstk.rs

@@ -24,7 +24,7 @@ use crate::entrypoint::abort_with_code_and_message;
 
 /// Exception handler
 #[no_mangle]
-pub extern "sysv64" fn hl_exception_handler(
+pub extern "C" fn hl_exception_handler(
     stack_pointer: u64,
     exception_number: u64,
     page_fault_address: u64,

src/hyperlight_guest/src/entrypoint.rs

@@ -16,7 +16,7 @@ limitations under the License.
 
 use hyperlight_common::outb::Exception;
 
-use crate::interrupt_entry::{
+use crate::exceptions::interrupt_entry::{
     _do_excp0, _do_excp1, _do_excp10, _do_excp11, _do_excp12, _do_excp13, _do_excp14, _do_excp15,
     _do_excp16, _do_excp17, _do_excp18, _do_excp19, _do_excp2, _do_excp20, _do_excp3, _do_excp30,
     _do_excp4, _do_excp5, _do_excp6, _do_excp7, _do_excp8, _do_excp9,
@@ -96,7 +96,7 @@ pub(crate) fn init_idt() {
     set_idt_entry(Exception::SecurityException as usize, _do_excp30); // Security Exception
 }
 
-fn set_idt_entry(index: usize, handler: unsafe extern "sysv64" fn()) {
+fn set_idt_entry(index: usize, handler: unsafe extern "C" fn()) {
     let handler_addr = handler as *const () as u64;
     unsafe {
         IDT[index] = IdtEntry::new(handler_addr);