Use regular Rust static-PIE for Rust storage example

Author: fwsGonzo

guest/rust_storage/build.sh

@@ -3,7 +3,7 @@ set -e
 pushd storage_program
 ./build.sh
 popd
-storage_binary=./storage_program/target/x86_64-unknown-linux-musl/release/demo
+storage_binary=./storage_program/target/release/demo
 objcopy -w --extract-symbol --strip-symbol=!remote* --strip-symbol=* $storage_binary storage.syms
 gcc-12 -static -O2 symbol_offset.c -o symbol_offset
 ./symbol_offset storage.syms 0x44000000

guest/rust_storage/storage_program/build.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 set -e
-RUSTFLAGS="-Zexport-executable-symbols" cargo build --target x86_64-unknown-linux-musl --release
+RUSTFLAGS="-Ctarget-feature=+crt-static -Zexport-executable-symbols" cargo build --release
+#RUSTFLAGS="-Zexport-executable-symbols" cargo build --target x86_64-unknown-linux-musl --release

guest/rust_storage/storage_program/src/main.rs

@@ -1,7 +1,12 @@
 use std::process::ExitCode;
+use std::sync::{LazyLock, Mutex};
+static ARRAY: LazyLock<Mutex<Vec<i32>>> = LazyLock::new(|| Mutex::new(vec![]));
 
 #[no_mangle]
 extern "C" fn remote_function(arg: fn(i32) -> i32, value: i32) -> i32 {
+	// Locked reference to avoid data race issues
+	ARRAY.lock().unwrap().push(value);
+	//println!("In remote_function with vec: {:?}", *ARRAY.lock().unwrap());
 	return arg(value);
 }
 

src/storage.cpp

@@ -170,7 +170,7 @@ int main(int argc, char** argv)
 	tinykvm::Machine vm{master_vm, options};
 	assert(vm.is_remote_connected());
 
-	/* Call 'do_calculation' with 21 as argument */
+	/* Measure call overhead */
 	auto do_it = callback_address.find("do_nothing");
 	if (do_it == callback_address.end()) {
 		fprintf(stderr, "Error: no do_nothing() in guest\n");
@@ -187,6 +187,7 @@ int main(int argc, char** argv)
 	}) / 100.0;
 	printf("Call overhead: %.2fus\n", call_overhead * 1e6);
 
+	/* Call 'do_calculation' with 21 as argument */
 	printf("Calling do_calculation() @ 0x%lX\n", calc_it->second);
 	for (int i = 0; i < 10; i++)
 		vm.timed_vmcall(calc_it->second, 5.0f, 21);