Merge #375

375: [PLAT-421] Improve error handling r=Pagten a=raoulstrackx



Co-authored-by: Raoul Strackx <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -29,7 +29,8 @@ function setup_environment {
 function start_runner {
     pushd fortanix-vme-runner
     cargo +${toolchain_version} --locked build
-    cargo +${toolchain_version} --locked run &
+    log=$(mktemp /tmp/ci-fortanixvme.log.XXXXX)
+    RUST_LOG=debug cargo +${toolchain_version} --locked run 2> ${log} &
 
     if [[ -v AWS_VM ]]; then
         ssh ubuntu@${AWS_VM} 'mkdir -p /home/ubuntu/ci-fortanixvme'

fortanix-vme/ci-fortanixvme.sh

@@ -12,9 +12,10 @@ alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-all
 compiler_builtins = { version = "0.1.0", optional = true }
 # Avoid using patch section due to https://github.com/rust-lang/cargo/issues/10031
 serde = { git = "https://github.com/fortanix/serde.git", branch = "master", default-features = false, features = ["derive", "alloc"] }
+vsock = { version = "0.2.4", optional = true }
 
 [features]
-std = ["serde/std"]
+std = ["serde/std", "vsock"]
 default = ["std"]
 docs = []
 rustc-dep-of-std = ["core", "alloc", "compiler_builtins/rustc-dep-of-std", "serde/rustc-dep-of-std"]

fortanix-vme/fortanix-vme-abi/Cargo.toml

@@ -7,7 +7,11 @@ extern crate std;
 use alloc::string::String;
 use serde::{Deserialize, Serialize};
 #[cfg(feature="std")]
-use std::net::SocketAddr;
+use {
+    std::io,
+    std::net::SocketAddr,
+    vsock::Error as VsockError,
+};
 
 pub const SERVER_PORT: u32 = 10000;
 
@@ -108,6 +112,33 @@ pub enum Response {
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Error {
     ConnectionNotFound,
+    SystemError(i32),
+    Unknown,
+    VsockError,
+}
+
+#[cfg(feature="std")]
+impl From<io::Error> for Error {
+    fn from(error: io::Error) -> Error {
+        if let Some(errno) = error.raw_os_error() {
+            Error::SystemError(errno)
+        } else {
+            Error::Unknown
+        }
+    }
+}
+
+#[cfg(feature="std")]
+impl From<VsockError> for Error {
+    fn from(error: VsockError) -> Error {
+        match error {
+            VsockError::EntropyError        => Error::VsockError,
+            VsockError::SystemError(errno)  => Error::SystemError(errno),
+            VsockError::WrongAddressType    => Error::VsockError,
+            VsockError::ZeroDurationTimeout => Error::VsockError,
+            VsockError::ReservedPort        => Error::VsockError,
+        }
+    }
 }
 
 #[cfg(test)]

fortanix-vme/fortanix-vme-abi/src/lib.rs

@@ -5,8 +5,10 @@ edition = "2018"
 authors = ["Fortanix, Inc."]
 
 [dependencies]
+env_logger = "0.8.4"
 fnv = "1.0.7"
 fortanix-vme-abi = { path = "../fortanix-vme-abi", features = ["std"] }
+log = "0.4.14"
 nix = "0.22.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_cbor = { version = "0.11" }