Merge branch 'main' into nvmeUpdateLogType

Author: SrinivasShekar

.config/nextest.toml

@@ -40,19 +40,13 @@ store-success-output = "true"
 filter = 'test(loom)'
 slow-timeout = { period = "30s", terminate-after = 2 }
 
-# Reboot VMM tests take extra long
-[[profile.ci.overrides]]
-filter = 'package(~vmm_tests) & test(reboot)'
-slow-timeout = { period = "5m", terminate-after = 2 }
-
 [[profile.ci.overrides]]
 # use fuzzy-matching for the package() to allow out-of-tree tests to use the
 # same profile
 filter = 'package(~vmm_tests)'
-# Allow VMM tests longer timeouts.
-# Important Note: Petri's watchdogs need to know this value too.
-# If you change it here then change it there!
-slow-timeout = { period = "3m", terminate-after = 2 }
+# VMM tests contain their own watchdog timer, but keep an extra long timer
+# here as a backup.
+slow-timeout = { period = "10m", terminate-after = 1 }
 
 # TEMP (hopefully): For reasons that continue to befuddle, running Windows
 # release-mode unit tests in flowey CI is resulting in seemingly-random

.github/workflows/openvmm-ci.yaml

@@ -5560,6 +5560,7 @@ dependencies = [
  "get_resources",
  "gptman",
  "guid",
+ "hvdef",
  "hvlite_defs",
  "hvlite_helpers",
  "hvlite_pcat_locator",
@@ -5588,6 +5589,7 @@ dependencies = [
  "pipette_client",
  "powershell_builder",
  "prost",
+ "safe_intrinsics",
  "scsidisk_resources",
  "serde",
  "serde_json",
@@ -5617,6 +5619,7 @@ dependencies = [
  "vmsocket",
  "vtl2_settings_proto",
  "windows-version",
+ "x86defs",
 ]
 
 [[package]]
@@ -5861,6 +5864,25 @@ dependencies = [
  "zerocopy 0.8.25",
 ]
 
+[[package]]
+name = "prep_steps"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "guid",
+ "hvlite_defs",
+ "hvlite_helpers",
+ "pal_async",
+ "petri",
+ "petri_artifact_resolver_openvmm_known_paths",
+ "petri_artifacts_common",
+ "petri_artifacts_vmm_test",
+ "scsidisk_resources",
+ "storvsp_resources",
+ "tracing",
+ "vm_resource",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.1.25"
@@ -9136,6 +9158,7 @@ dependencies = [
  "disk_backend",
  "disk_vhd1",
  "fs-err",
+ "getrandom 0.3.3",
  "guid",
  "hcl_compat_uefi_nvram_storage",
  "hex",
@@ -9243,12 +9266,10 @@ name = "vmm_tests"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "cfg-if",
  "disk_backend_resources",
  "futures",
  "get_resources",
  "guid",
- "hvdef",
  "hvlite_defs",
  "hvlite_ttrpc_vmservice",
  "hyperv_ic_resources",
@@ -9266,7 +9287,6 @@ dependencies = [
  "petri_artifact_resolver_openvmm_known_paths",
  "petri_artifacts_common",
  "petri_artifacts_vmm_test",
- "safe_intrinsics",
  "scsidisk_resources",
  "storvsp_resources",
  "tempfile",
@@ -9276,8 +9296,6 @@ dependencies = [
  "virtio_resources",
  "vm_resource",
  "vmm_test_macros",
- "vtl2_settings_proto",
- "x86defs",
  "zerocopy 0.8.25",
 ]
 

.github/workflows/openvmm-pr-release.yaml

@@ -20,6 +20,7 @@ members = [
   "tmk/tmk_vmm",
   "tmk/simple_tmk",
   # VMM tests
+  "vmm_tests/prep_steps",
   "vmm_tests/vmm_tests",
   # hyper-v tooling
   "hyperv/tools/hypestv",

.github/workflows/openvmm-pr.yaml

@@ -252,6 +252,12 @@ impl IntoPipeline for CheckinGatesCli {
             let (pub_tmk_vmm, use_tmk_vmm) =
                 pipeline.new_typed_artifact(format!("{arch_tag}-windows-tmk_vmm"));
 
+            let (pub_prep_steps, use_prep_steps) =
+                pipeline.new_typed_artifact(format!("{arch_tag}-windows-prep_steps"));
+
+            let (pub_vmgstool, use_vmgstool) =
+                pipeline.new_typed_artifact(format!("{arch_tag}-windows-vmgstool"));
+
             // filter off interesting artifacts required by the VMM tests job
             match arch {
                 CommonArch::X86_64 => {
@@ -261,6 +267,8 @@ impl IntoPipeline for CheckinGatesCli {
                     vmm_tests_artifacts_windows_x86.use_pipette_windows =
                         Some(use_pipette_windows.clone());
                     vmm_tests_artifacts_windows_x86.use_tmk_vmm = Some(use_tmk_vmm.clone());
+                    vmm_tests_artifacts_windows_x86.use_prep_steps = Some(use_prep_steps.clone());
+                    vmm_tests_artifacts_windows_x86.use_vmgstool = Some(use_vmgstool.clone());
                 }
                 CommonArch::Aarch64 => {
                     vmm_tests_artifacts_windows_aarch64.use_openvmm = Some(use_openvmm.clone());
@@ -276,8 +284,6 @@ impl IntoPipeline for CheckinGatesCli {
                 pipeline.new_typed_artifact(format!("{arch_tag}-windows-igvmfilegen"));
             let (pub_vmgs_lib, _use_vmgs_lib) =
                 pipeline.new_typed_artifact(format!("{arch_tag}-windows-vmgs_lib"));
-            let (pub_vmgstool, _use_vmgstool) =
-                pipeline.new_typed_artifact(format!("{arch_tag}-windows-vmgstool"));
             let (pub_hypestv, _use_hypestv) =
                 pipeline.new_typed_artifact(format!("{arch_tag}-windows-hypestv"));
             let (pub_ohcldiag_dev, _use_ohcldiag_dev) =
@@ -292,15 +298,6 @@ impl IntoPipeline for CheckinGatesCli {
                 .gh_set_pool(crate::pipelines_shared::gh_pools::default_x86_pool(
                     FlowPlatform::Windows,
                 ))
-                .dep_on(|ctx| flowey_lib_hvlite::build_vmgstool::Request {
-                    target: CommonTriple::Common {
-                        arch,
-                        platform: CommonPlatform::WindowsMsvc,
-                    },
-                    profile: CommonProfile::from_release(release),
-                    with_crypto: true,
-                    vmgstool: ctx.publish_typed_artifact(pub_vmgstool),
-                })
                 .dep_on(|ctx| flowey_lib_hvlite::build_hypestv::Request {
                     target: CommonTriple::Common {
                         arch,
@@ -384,6 +381,23 @@ impl IntoPipeline for CheckinGatesCli {
                     unstable_whp: true, // The ARM64 CI runner supports the unstable WHP interface
                     profile: CommonProfile::from_release(release),
                     tmk_vmm: ctx.publish_typed_artifact(pub_tmk_vmm),
+                })
+                .dep_on(|ctx| flowey_lib_hvlite::build_prep_steps::Request {
+                    target: CommonTriple::Common {
+                        arch,
+                        platform: CommonPlatform::WindowsMsvc,
+                    },
+                    profile: CommonProfile::from_release(release),
+                    prep_steps: ctx.publish_typed_artifact(pub_prep_steps),
+                })
+                .dep_on(|ctx| flowey_lib_hvlite::build_vmgstool::Request {
+                    target: CommonTriple::Common {
+                        arch,
+                        platform: CommonPlatform::WindowsMsvc,
+                    },
+                    profile: CommonProfile::from_release(release),
+                    with_crypto: true,
+                    vmgstool: ctx.publish_typed_artifact(pub_vmgstool),
                 });
 
             // Hang building the windows VMM tests off this big windows job.
@@ -884,13 +898,13 @@ impl IntoPipeline for CheckinGatesCli {
             resolve_vmm_tests_artifacts: vmm_tests_artifact_builders::ResolveVmmTestsDepArtifacts,
             nextest_filter_expr: String,
             test_artifacts: Vec<KnownTestArtifacts>,
+            needs_prep_run: bool,
         }
 
         // standard VM-based CI machines should be able to run all tests except
         // those that require special hardware features (tdx/snp) or need to be
         // run on a baremetal host (hyper-v vbs doesn't seem to work nested)
-        let standard_filter =
-            "all() & !test(tdx) & !test(snp) & !(test(vbs) & test(hyperv))".to_string();
+        let standard_filter = "all()".to_string();
         let standard_x64_test_artifacts = vec![
             KnownTestArtifacts::FreeBsd13_2X64Vhd,
             KnownTestArtifacts::FreeBsd13_2X64Iso,
@@ -902,6 +916,7 @@ impl IntoPipeline for CheckinGatesCli {
 
         let cvm_filter = |arch| format!("test({arch}) + (test(vbs) & test(hyperv))");
         let cvm_x64_test_artifacts = vec![
+            KnownTestArtifacts::Gen2WindowsDataCenterCore2022X64Vhd,
             KnownTestArtifacts::Gen2WindowsDataCenterCore2025X64Vhd,
             KnownTestArtifacts::Ubuntu2404ServerX64Vhd,
         ];
@@ -915,6 +930,7 @@ impl IntoPipeline for CheckinGatesCli {
             resolve_vmm_tests_artifacts,
             nextest_filter_expr,
             test_artifacts,
+            needs_prep_run,
         } in [
             VmmTestJobParams {
                 platform: FlowPlatform::Windows,
@@ -925,6 +941,7 @@ impl IntoPipeline for CheckinGatesCli {
                 resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_intel_x86,
                 nextest_filter_expr: standard_filter.clone(),
                 test_artifacts: standard_x64_test_artifacts.clone(),
+                needs_prep_run: false,
             },
             VmmTestJobParams {
                 platform: FlowPlatform::Windows,
@@ -935,6 +952,7 @@ impl IntoPipeline for CheckinGatesCli {
                 resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_intel_tdx_x86,
                 nextest_filter_expr: cvm_filter("tdx"),
                 test_artifacts: cvm_x64_test_artifacts.clone(),
+                needs_prep_run: true,
             },
             VmmTestJobParams {
                 platform: FlowPlatform::Windows,
@@ -945,6 +963,7 @@ impl IntoPipeline for CheckinGatesCli {
                 resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_amd_x86,
                 nextest_filter_expr: standard_filter.clone(),
                 test_artifacts: standard_x64_test_artifacts.clone(),
+                needs_prep_run: false,
             },
             VmmTestJobParams {
                 platform: FlowPlatform::Windows,
@@ -955,6 +974,7 @@ impl IntoPipeline for CheckinGatesCli {
                 resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_amd_snp_x86,
                 nextest_filter_expr: cvm_filter("snp"),
                 test_artifacts: cvm_x64_test_artifacts,
+                needs_prep_run: true,
             },
             VmmTestJobParams {
                 platform: FlowPlatform::Linux(FlowPlatformLinuxDistro::Ubuntu),
@@ -966,6 +986,7 @@ impl IntoPipeline for CheckinGatesCli {
                 // - No legal way to obtain gen1 pcat blobs on non-msft linux machines
                 nextest_filter_expr: format!("{standard_filter} & !test(pcat_x64)"),
                 test_artifacts: standard_x64_test_artifacts,
+                needs_prep_run: false,
             },
             VmmTestJobParams {
                 platform: FlowPlatform::Windows,
@@ -980,6 +1001,7 @@ impl IntoPipeline for CheckinGatesCli {
                     KnownTestArtifacts::Windows11EnterpriseAarch64Vhdx,
                     KnownTestArtifacts::VmgsWithBootEntry,
                 ],
+                needs_prep_run: false,
             },
         ] {
             let test_label = format!("{label}-vmm-tests");
@@ -1012,6 +1034,7 @@ impl IntoPipeline for CheckinGatesCli {
                         test_artifacts,
                         fail_job_on_test_fail: true,
                         artifact_dir: pub_vmm_tests_results.map(|x| ctx.publish_artifact(x)),
+                        needs_prep_run,
                         done: ctx.new_done_handle(),
                     }
                 });
@@ -1096,8 +1119,10 @@ mod vmm_tests_artifact_builders {
     use flowey_lib_hvlite::build_guest_test_uefi::GuestTestUefiOutput;
     use flowey_lib_hvlite::build_openvmm::OpenvmmOutput;
     use flowey_lib_hvlite::build_pipette::PipetteOutput;
+    use flowey_lib_hvlite::build_prep_steps::PrepStepsOutput;
     use flowey_lib_hvlite::build_tmk_vmm::TmkVmmOutput;
     use flowey_lib_hvlite::build_tmks::TmksOutput;
+    use flowey_lib_hvlite::build_vmgstool::VmgstoolOutput;
 
     pub type ResolveVmmTestsDepArtifacts =
         Box<dyn Fn(&mut PipelineJobCtx<'_>) -> VmmTestsDepArtifacts>;
@@ -1143,6 +1168,8 @@ mod vmm_tests_artifact_builders {
                 // not currently required, since OpenHCL tests cannot be run on OpenVMM on linux
                 artifact_dir_openhcl_igvm_files: None,
                 tmk_vmm_linux_musl: None,
+                prep_steps: None,
+                vmgstool: None,
             }))
         }
     }
@@ -1153,6 +1180,8 @@ mod vmm_tests_artifact_builders {
         pub use_openvmm: Option<UseTypedArtifact<OpenvmmOutput>>,
         pub use_pipette_windows: Option<UseTypedArtifact<PipetteOutput>>,
         pub use_tmk_vmm: Option<UseTypedArtifact<TmkVmmOutput>>,
+        pub use_prep_steps: Option<UseTypedArtifact<PrepStepsOutput>>,
+        pub use_vmgstool: Option<UseTypedArtifact<VmgstoolOutput>>,
         // linux build machine
         pub use_openhcl_igvm_files: Option<UseArtifact>,
         pub use_pipette_linux_musl: Option<UseTypedArtifact<PipetteOutput>>,
@@ -1173,6 +1202,8 @@ mod vmm_tests_artifact_builders {
                 use_tmk_vmm,
                 use_tmk_vmm_linux_musl,
                 use_tmks,
+                use_prep_steps,
+                use_vmgstool,
             } = self;
 
             let use_openvmm = use_openvmm.ok_or("openvmm")?;
@@ -1183,6 +1214,8 @@ mod vmm_tests_artifact_builders {
             let use_tmk_vmm = use_tmk_vmm.ok_or("tmk_vmm")?;
             let use_tmk_vmm_linux_musl = use_tmk_vmm_linux_musl.ok_or("tmk_vmm_linux_musl")?;
             let use_tmks = use_tmks.ok_or("tmks")?;
+            let use_prep_steps = use_prep_steps.ok_or("prep_steps")?;
+            let use_vmgstool = use_vmgstool.ok_or("vmgstool")?;
 
             Ok(Box::new(move |ctx| VmmTestsDepArtifacts {
                 openvmm: Some(ctx.use_typed_artifact(&use_openvmm)),
@@ -1193,6 +1226,8 @@ mod vmm_tests_artifact_builders {
                 tmk_vmm: Some(ctx.use_typed_artifact(&use_tmk_vmm)),
                 tmk_vmm_linux_musl: Some(ctx.use_typed_artifact(&use_tmk_vmm_linux_musl)),
                 tmks: Some(ctx.use_typed_artifact(&use_tmks)),
+                prep_steps: Some(ctx.use_typed_artifact(&use_prep_steps)),
+                vmgstool: Some(ctx.use_typed_artifact(&use_vmgstool)),
             }))
         }
     }
@@ -1243,6 +1278,8 @@ mod vmm_tests_artifact_builders {
                 tmk_vmm: Some(ctx.use_typed_artifact(&use_tmk_vmm)),
                 tmk_vmm_linux_musl: Some(ctx.use_typed_artifact(&use_tmk_vmm_linux_musl)),
                 tmks: Some(ctx.use_typed_artifact(&use_tmks)),
+                prep_steps: None,
+                vmgstool: None,
             }))
         }
     }

Cargo.lock

@@ -13,7 +13,7 @@ pub mod restore_packages;
 pub mod vmm_tests;
 
 #[derive(clap::Subcommand)]
-#[expect(clippy::large_enum_variant)]
+#[cfg_attr(windows, expect(clippy::large_enum_variant))]
 pub enum OpenvmmPipelines {
     /// Alias for root-level `regen` command.
     // DEVNOTE: this enables the useful `cargo xflowey regen` alias

Cargo.toml

@@ -70,6 +70,13 @@ pub struct VmmTestsCli {
     /// Copy extras to output dir (symbols, etc)
     #[clap(long)]
     copy_extras: bool,
+
+    /// Optional: custom kernel modules
+    #[clap(long)]
+    custom_kernel_modules: Option<PathBuf>,
+    /// Optional: custom kernel image
+    #[clap(long)]
+    custom_kernel: Option<PathBuf>,
 }
 
 impl IntoPipeline for VmmTestsCli {
@@ -90,6 +97,8 @@ impl IntoPipeline for VmmTestsCli {
             release,
             build_only,
             copy_extras,
+            custom_kernel_modules,
+            custom_kernel,
         } = self;
 
         let openvmm_repo = flowey_lib_common::git_checkout::RepoSource::ExistingClone(
@@ -185,6 +194,8 @@ impl IntoPipeline for VmmTestsCli {
                     release,
                     build_only,
                     copy_extras,
+                    custom_kernel_modules,
+                    custom_kernel,
                     done: ctx.new_done_handle(),
                 },
             )

flowey/flowey_hvlite/src/pipelines/checkin_gates.rs

@@ -46,7 +46,7 @@ impl SimpleFlowNode for Node {
 
                 let id = xshell::cmd!(
                     sh,
-                    "{gh_cli} run list -R {repo} -b {branch} -w {pipeline_name} -s completed --limit 1 --json databaseId -q .[0].databaseId"
+                    "{gh_cli} run list -R {repo} -b {branch} -w {pipeline_name} -s success --limit 1 --json databaseId -q .[0].databaseId"
                 )
                 .read()?;