Remove callbackguest (#871)

moves functionality of callbackguest into simpleguest
Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

.github/dependabot.yml

@@ -21,16 +21,6 @@ updates:
       - dependency-name: "mshv-bindings"
         versions: [ ">=0.2.1" ]
     open-pull-requests-limit: 20
-  # Excluded workspace members - guests with custom linker flags
-  - package-ecosystem: "cargo"
-    directory: "/src/tests/rust_guests/callbackguest"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-    labels:
-      - "kind/dependencies"
-      - "area/guest"
-    open-pull-requests-limit: 5
   - package-ecosystem: "cargo"
     directory: "/src/tests/rust_guests/dummyguest"
     schedule:

.github/workflows/Benchmarks.yml

@@ -48,10 +48,8 @@ jobs:
 
       - name: Copy Guest Binaries
         run: |
-          cp ./downloaded-rust-guest-binaries-release/callbackguest ./src/tests/rust_guests/bin/release/callbackguest
           cp ./downloaded-rust-guest-binaries-release/simpleguest ./src/tests/rust_guests/bin/release/simpleguest
           cp ./downloaded-rust-guest-binaries-release/dummyguest ./src/tests/rust_guests/bin/release/dummyguest
-          cp ./downloaded-c-guest-binaries-release/callbackguest ./src/tests/c_guests/bin/release/callbackguest
           cp ./downloaded-c-guest-binaries-release/simpleguest ./src/tests/c_guests/bin/release/simpleguest
 
       ### Benchmarks ###

.github/workflows/dep_build_guest_binaries.yml

@@ -45,7 +45,6 @@ jobs:
         with:
           name: rust-guest-binaries-${{ matrix.config }}
           path: |
-            src\tests\rust_guests\bin\${{ matrix.config }}\callbackguest
             src\tests\rust_guests\bin\${{ matrix.config }}\dummyguest
             src\tests\rust_guests\bin\${{ matrix.config }}\simpleguest
           if-no-files-found: error
@@ -55,6 +54,5 @@ jobs:
         with:
           name: c-guest-binaries-${{ matrix.config }}
           path: |
-            src\tests\c_guests\bin\${{ matrix.config }}\callbackguest
             src\tests\c_guests\bin\${{ matrix.config }}\simpleguest
           if-no-files-found: error

.vscode/settings.json

@@ -3,6 +3,5 @@
         "Cargo.toml", 
         // guest crates for testing, not part of the workspace
         "src/tests/rust_guests/simpleguest/Cargo.toml",
-        "src/tests/rust_guests/callbackguest/Cargo.toml"
     ]
 }

Cargo.toml

@@ -21,7 +21,6 @@ members = [
 ]
 # Guests have custom linker flags, so we need to exclude them from the workspace
 exclude = [
-    "src/tests/rust_guests/callbackguest",
     "src/tests/rust_guests/dummyguest",
     "src/tests/rust_guests/simpleguest",
     "src/tests/rust_guests/witguest",

Justfile

@@ -11,7 +11,6 @@ root := justfile_directory()
 default-target := "debug"
 simpleguest_source := "src/tests/rust_guests/simpleguest/target/x86_64-unknown-none"
 dummyguest_source := "src/tests/rust_guests/dummyguest/target/x86_64-unknown-none"
-callbackguest_source := "src/tests/rust_guests/callbackguest/target/x86_64-unknown-none"
 witguest_source := "src/tests/rust_guests/witguest/target/x86_64-unknown-none"
 rust_guests_bin_dir := "src/tests/rust_guests/bin"
 
@@ -39,13 +38,11 @@ witguest-wit:
     cd src/tests/rust_guests/witguest && wasm-tools component wit guest.wit -w -o interface.wasm
 
 build-rust-guests target=default-target features="": (witguest-wit)
-    cd src/tests/rust_guests/callbackguest && cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }}
     cd src/tests/rust_guests/simpleguest && cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }} 
     cd src/tests/rust_guests/dummyguest && cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }} 
     cd src/tests/rust_guests/witguest && cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }}
 
 @move-rust-guests target=default-target:
-    cp {{ callbackguest_source }}/{{ target }}/callbackguest* {{ rust_guests_bin_dir }}/{{ target }}/
     cp {{ simpleguest_source }}/{{ target }}/simpleguest* {{ rust_guests_bin_dir }}/{{ target }}/
     cp {{ dummyguest_source }}/{{ target }}/dummyguest* {{ rust_guests_bin_dir }}/{{ target }}/
     cp {{ witguest_source }}/{{ target }}/witguest* {{ rust_guests_bin_dir }}/{{ target }}/
@@ -59,7 +56,6 @@ clean-rust:
     cargo clean
     cd src/tests/rust_guests/simpleguest && cargo clean
     cd src/tests/rust_guests/dummyguest && cargo clean
-    cd src/tests/rust_guests/callbackguest && cargo clean
     {{ if os() == "windows" { "cd src/tests/rust_guests/witguest -ErrorAction SilentlyContinue; cargo clean" } else { "[ -d src/tests/rust_guests/witguest ] && cd src/tests/rust_guests/witguest && cargo clean || true" } }}
     {{ if os() == "windows" { "Remove-Item src/tests/rust_guests/witguest/interface.wasm -Force -ErrorAction SilentlyContinue" } else { "rm -f src/tests/rust_guests/witguest/interface.wasm" } }}
     git clean -fdx src/tests/c_guests/bin src/tests/rust_guests/bin
@@ -229,7 +225,6 @@ check:
 
 fmt-check:
     cargo +nightly fmt --all -- --check
-    cargo +nightly fmt --manifest-path src/tests/rust_guests/callbackguest/Cargo.toml -- --check
     cargo +nightly fmt --manifest-path src/tests/rust_guests/simpleguest/Cargo.toml -- --check
     cargo +nightly fmt --manifest-path src/tests/rust_guests/dummyguest/Cargo.toml -- --check
     cargo +nightly fmt --manifest-path src/tests/rust_guests/witguest/Cargo.toml -- --check
@@ -240,7 +235,6 @@ check-license-headers:
 
 fmt-apply:
     cargo +nightly fmt --all
-    cargo +nightly fmt --manifest-path src/tests/rust_guests/callbackguest/Cargo.toml
     cargo +nightly fmt --manifest-path src/tests/rust_guests/simpleguest/Cargo.toml
     cargo +nightly fmt --manifest-path src/tests/rust_guests/dummyguest/Cargo.toml
     cargo +nightly fmt --manifest-path src/tests/rust_guests/witguest/Cargo.toml
@@ -251,7 +245,6 @@ clippy target=default-target: (witguest-wit)
 
 clippy-guests target=default-target: (witguest-wit)
     cd src/tests/rust_guests/simpleguest && cargo clippy --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
-    cd src/tests/rust_guests/callbackguest && cargo clippy --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
     cd src/tests/rust_guests/witguest && cargo clippy --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
 
 clippy-apply-fix-unix:

c.just

@@ -16,14 +16,11 @@ build-rust-capi target=default-target:
 compile-c-guest target=default-target:
     # elf
     cd src/tests/c_guests/c_simpleguest && {{ mkdir }} "./out/{{target}}" && clang -c {{ c-compile-options-elf }} {{ if target == "debug" { c-flags-debug-elf } else { c-flags-release-elf } }} main.c {{c-include-flags-elf}} -o "out/{{ target }}/main.o"
-    cd src/tests/c_guests/c_callbackguest && {{ mkdir }} "./out/{{target}}" && clang -c {{ c-compile-options-elf }} {{ if target == "debug" { c-flags-debug-elf } else { c-flags-release-elf } }} main.c {{c-include-flags-elf}} -o "out/{{ target }}/main.o"
 
 link-c-guest target=default-target:
     # elf
     cd src/tests/c_guests/c_simpleguest && ld.lld -o out/{{target}}/simpleguest {{c-linker-options-elf}} out/{{target}}/main.o -l hyperlight_guest_capi -L "{{justfile_directory()}}/target/x86_64-unknown-none/{{target}}"
-    cd src/tests/c_guests/c_callbackguest && ld.lld -o out/{{target}}/callbackguest {{c-linker-options-elf}} out/{{target}}/main.o -l hyperlight_guest_capi -L "{{justfile_directory()}}/target/x86_64-unknown-none/{{target}}"
 
 move-c-guests target=default-target:
     # elf
     cp src/tests/c_guests/c_simpleguest/out/{{target}}/simpleguest src/tests/c_guests/bin/{{target}}/
-    cp src/tests/c_guests/c_callbackguest/out/{{target}}/callbackguest src/tests/c_guests/bin/{{target}}/

src/hyperlight_host/src/lib.rs

@@ -81,8 +81,7 @@ pub(crate) mod seccomp;
 /// Signal handling for Linux
 #[cfg(target_os = "linux")]
 pub(crate) mod signal_handlers;
-/// Utilities for testing including interacting with `simpleguest.exe`
-/// and `callbackguest.exe`, our two most basic guest binaries for testing
+/// Utilities for testing including interacting with `simpleguest` testing guest binary
 #[cfg(test)]
 pub(crate) mod testing;
 

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -271,18 +271,15 @@ pub(crate) fn set_up_hypervisor_partition(
 
 #[cfg(test)]
 mod tests {
-    use hyperlight_testing::{callback_guest_as_string, simple_guest_as_string};
+    use hyperlight_testing::simple_guest_as_string;
 
     use super::evolve_impl_multi_use;
     use crate::UninitializedSandbox;
     use crate::sandbox::uninitialized::GuestBinary;
 
     #[test]
     fn test_evolve() {
-        let guest_bin_paths = vec![
-            simple_guest_as_string().unwrap(),
-            callback_guest_as_string().unwrap(),
-        ];
+        let guest_bin_paths = vec![simple_guest_as_string().unwrap()];
         for guest_bin_path in guest_bin_paths {
             let u_sbox =
                 UninitializedSandbox::new(GuestBinary::FilePath(guest_bin_path.clone()), None)

src/hyperlight_host/tests/common/mod.rs

@@ -15,10 +15,7 @@ limitations under the License.
 */
 use hyperlight_host::func::HostFunction;
 use hyperlight_host::{GuestBinary, MultiUseSandbox, Result, UninitializedSandbox};
-use hyperlight_testing::{
-    c_callback_guest_as_string, c_simple_guest_as_string, callback_guest_as_string,
-    simple_guest_as_string,
-};
+use hyperlight_testing::{c_simple_guest_as_string, simple_guest_as_string};
 
 /// Returns a rust/c simpleguest depending on environment variable GUEST.
 /// Uses rust guest by default. Run test with environment variable GUEST="c" to use the c version
@@ -59,10 +56,10 @@ pub fn get_simpleguest_sandboxes(
         .collect()
 }
 
-pub fn get_callbackguest_uninit_sandboxes(
+pub fn get_uninit_simpleguest_sandboxes(
     writer: Option<HostFunction<i32, (String,)>>, // An optional writer to make sure correct info is passed to the host printer
 ) -> Vec<UninitializedSandbox> {
-    let elf_path = get_c_or_rust_callbackguest_path();
+    let elf_path = get_c_or_rust_simpleguest_path();
 
     let sandboxes = [
         // in hypervisor elf
@@ -89,13 +86,3 @@ pub(crate) fn get_c_or_rust_simpleguest_path() -> String {
         _ => panic!("Unknown guest type '{guest_type}', use either 'rust' or 'c'"),
     }
 }
-
-// returns the the path of callbackguest binary. Picks rust/ version depending on environment variable GUEST (or rust by default if unset)
-fn get_c_or_rust_callbackguest_path() -> String {
-    let guest_type = std::env::var("GUEST").unwrap_or("rust".to_string());
-    match guest_type.as_str() {
-        "rust" => callback_guest_as_string().unwrap(),
-        "c" => c_callback_guest_as_string().unwrap(),
-        _ => panic!("Unknown guest type '{guest_type}', use either 'rust' or 'c'"),
-    }
-}