vmm_tests: vmbus relay test for TDX (#1472) (#1672)

Fix for issue #1268

- Added changes to petri to be able to run test vm with vmbus relay
enabled.
- Implement the petri vmbus relay config for Hyper-V and OpenVMM
- Added a new boot test with vmbus relay enable for TDX.

Cherry-pick of #1472

---------

Co-authored-by: Trevor Jones <trevor@thjmedia.net>
Co-authored-by: Kunal Mehta <100309140+kmehtaintel@users.noreply.github.com>

Author: 3 people

Cargo.lock

@@ -5430,6 +5430,7 @@ dependencies = [
  "petri_artifacts_core",
  "petri_artifacts_vmm_test",
  "pipette_client",
+ "powershell_builder",
  "prost",
  "scsidisk_resources",
  "serde",
@@ -5665,6 +5666,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "powershell_builder"
+version = "0.0.0"
+dependencies = [
+ "guid",
+ "jiff",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.1.25"

Cargo.toml

@@ -134,6 +134,7 @@ pal_async = { path = "support/pal/pal_async" }
 pal_async_test = { path = "support/pal/pal_async_test" }
 pal_event = { path = "support/pal/pal_event" }
 pal_uring = { path = "support/pal/pal_uring" }
+powershell_builder = { path = "support/powershell_builder" }
 safeatomic = { path = "support/safeatomic" }
 serde_helpers = { path = "support/serde_helpers" }
 sev_guest_device = { path = "support/sev_guest_device" }

petri/Cargo.toml

@@ -57,6 +57,7 @@ mesh_worker.workspace = true
 mesh.workspace = true
 pal_async.workspace = true
 pal.workspace = true
+powershell_builder.workspace = true
 unix_socket.workspace = true
 sparse_mmap.workspace = true
 

petri/src/vm/hyperv/hvc.rs

@@ -3,12 +3,9 @@
 
 //! Functions for interacting with Hyper-V VMs.
 
-use super::CommandError;
+use super::vm::CommandError;
 use anyhow::Context;
 use guid::Guid;
-use jiff::Timestamp;
-use std::ffi::OsStr;
-use std::process::Stdio;
 
 pub fn hvc_start(vmid: &Guid) -> Result<(), CommandError> {
     hvc_output(|cmd| cmd.arg("start").arg(vmid.to_string())).map(|_| ())
@@ -95,37 +92,7 @@ fn hvc_output(
     f: impl FnOnce(&mut std::process::Command) -> &mut std::process::Command,
 ) -> Result<String, CommandError> {
     let mut cmd = std::process::Command::new("hvc.exe");
-    cmd.stderr(Stdio::piped()).stdin(Stdio::null());
     f(&mut cmd);
 
-    let hvc_cmd = format!(
-        "{} {}",
-        cmd.get_program().to_string_lossy(),
-        cmd.get_args()
-            .collect::<Vec<_>>()
-            .join(OsStr::new(" "))
-            .to_string_lossy()
-    );
-    tracing::debug!(hvc_cmd, "executing hvc command");
-
-    let start = Timestamp::now();
-    let output = cmd.output()?;
-    let time_elapsed = Timestamp::now() - start;
-
-    let hvc_stdout = String::from_utf8_lossy(&output.stdout).to_string();
-    let hvc_stderr = String::from_utf8_lossy(&output.stderr).to_string();
-    tracing::debug!(
-        hvc_cmd,
-        hvc_stdout,
-        hvc_stderr,
-        "hvc command exited in {:.3}s with status {}",
-        time_elapsed.total(jiff::Unit::Second).unwrap_or(-1.0),
-        output.status
-    );
-
-    if !output.status.success() {
-        return Err(CommandError::Command(output.status, hvc_stderr));
-    }
-
-    Ok(String::from_utf8(output.stdout)?.trim().to_owned())
+    super::vm::run_cmd(cmd)
 }

petri/src/vm/hyperv/hyperv.psm1

@@ -197,3 +197,23 @@ function Set-VmScsiControllerTargetVtl
     $rasd.TargetVtl = $TargetVtl
     $rasd | Set-VmResourceSettings
 }
+
+function Set-VMBusRedirect
+{
+    [CmdletBinding()]
+    Param (
+        [Parameter(Position = 0, Mandatory = $true, ValueFromPipeline = $true)]
+        [System.Object]
+        $Vm,
+
+        [Parameter(Mandatory = $true)]
+        [bool] $Enable
+    )
+
+    $vssd = Get-Vssd $Vm
+    $vssd | ForEach-Object {
+            $_.VMBusMessageRedirection = [int]$Enable
+            $_
+        }
+    Set-VmSystemSettings $vssd
+}

petri/src/vm/hyperv/mod.rs

@@ -38,7 +38,6 @@ use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
 use std::time::Duration;
-use thiserror::Error;
 use vm::HyperVVM;
 use vmm_core_defs::HaltReason;
 
@@ -61,6 +60,7 @@ pub struct PetriVmConfigHyperV {
     openhcl_igvm: Option<ResolvedArtifact>,
     openhcl_command_line: String,
     disable_frontpage: bool,
+    vmbus_redirect: bool,
 
     driver: DefaultDriver,
     agent_image: AgentImage,
@@ -128,6 +128,14 @@ impl PetriVmConfig for PetriVmConfigHyperV {
     fn with_uefi_frontpage(self: Box<Self>, enable: bool) -> Box<dyn PetriVmConfig> {
         Box::new(Self::with_uefi_frontpage(*self, enable))
     }
+
+    fn with_vmbus_redirect(self: Box<Self>, enable: bool) -> Box<dyn PetriVmConfig> {
+        Box::new(Self::with_vmbus_redirect(*self, enable))
+    }
+
+    fn os_flavor(&self) -> OsFlavor {
+        self.os_flavor
+    }
 }
 
 /// A running VM that tests can interact with.
@@ -297,6 +305,7 @@ impl PetriVmConfigHyperV {
             temp_dir,
             log_source: params.logger.clone(),
             disable_frontpage: true,
+            vmbus_redirect: false,
             openhcl_command_line: String::new(),
         })
     }
@@ -477,6 +486,9 @@ impl PetriVmConfigHyperV {
                 Some(0),
                 Some(controller_number),
             )?;
+
+            // Enable/Disable VMBusRedirect if requested in config
+            vm.set_vmbus_redirect(self.vmbus_redirect)?;
         }
 
         let mut log_tasks = Vec::new();
@@ -578,6 +590,12 @@ impl PetriVmConfigHyperV {
         self.disable_frontpage = !enable;
         self
     }
+
+    /// Enables VMBus relay for the VM
+    pub fn with_vmbus_redirect(mut self, enable: bool) -> Self {
+        self.vmbus_redirect = enable;
+        self
+    }
 }
 
 impl PetriVmHyperV {
@@ -717,20 +735,6 @@ impl PetriVmHyperV {
     }
 }
 
-/// Error running command
-#[derive(Error, Debug)]
-pub enum CommandError {
-    /// failed to launch command
-    #[error("failed to launch command")]
-    Launch(#[from] std::io::Error),
-    /// command exited with non-zero status
-    #[error("command exited with non-zero status ({0}): {1}")]
-    Command(std::process::ExitStatus, String),
-    /// command output is not utf-8
-    #[error("command output is not utf-8")]
-    Utf8(#[from] std::string::FromUtf8Error),
-}
-
 fn acl_read_for_vm(path: &Path, id: Option<guid::Guid>) -> anyhow::Result<()> {
     let sid_arg = format!(
         "NT VIRTUAL MACHINE\\{name}:R",