Skip to content

igvm: add sidecar to all non-CVM x64 recipes #1287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

igvm: add sidecar to all non-CVM x64 recipes #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8307db
igvm: add sidecar to all non-CVM x64 recipes
May 2, 2025
bf3fc2b
drop: use dev kernel everywhere to validate sidecar recipe changes
May 2, 2025
0979c23
ci: switch sidecar tests to use main kernel
May 2, 2025
1700c7e
kernel: update dev kernel to 6.12.9.2 which has a fix for sidecar wit…
May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/openvmm-ci.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .github/workflows/openvmm-pr.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub const NODEJS: &str = "18.x";
// N.B. Kernel version numbers for dev and stable branches are not directly
// comparable. They originate from separate branches, and the fourth digit
// increases with each release from the respective branch.
pub const OPENHCL_KERNEL_DEV_VERSION: &str = "6.12.9.1";
pub const OPENHCL_KERNEL_DEV_VERSION: &str = "6.12.9.2";
pub const OPENHCL_KERNEL_STABLE_VERSION: &str = "6.12.9.2";
pub const OPENVMM_DEPS: &str = "0.1.0-20250403.3";
pub const PROTOC: &str = "27.1";
Expand Down
6 changes: 3 additions & 3 deletions flowey/flowey_lib_hvlite/src/build_openhcl_igvm_from_recipe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl OpenhclIgvmRecipe {
vtl0_kernel_type: None,
with_uefi: true,
with_interactive,
with_sidecar: false,
with_sidecar: true,
},
Self::X64Devkern => OpenhclIgvmRecipeDetails {
local_only: None,
Expand Down Expand Up @@ -168,7 +168,7 @@ impl OpenhclIgvmRecipe {
vtl0_kernel_type: Some(Vtl0KernelType::Example),
with_uefi: false,
with_interactive,
with_sidecar: false,
with_sidecar: true,
},
Self::X64TestLinuxDirectDevkern => OpenhclIgvmRecipeDetails {
local_only: None,
Expand All @@ -182,7 +182,7 @@ impl OpenhclIgvmRecipe {
vtl0_kernel_type: Some(Vtl0KernelType::Example),
with_uefi: false,
with_interactive,
with_sidecar: false,
with_sidecar: true,
},
Self::X64Cvm => OpenhclIgvmRecipeDetails {
local_only: None,
Expand Down
4 changes: 2 additions & 2 deletions flowey/flowey_lib_hvlite/src/download_openhcl_kernel_package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl FlowNode for Node {
let tag = format!(
"rolling-lts/hcl-{}/{}",
match kind {
OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => "main",
OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => "dev",
OpenhclKernelPackageKind::Dev | OpenhclKernelPackageKind::CvmDev => "dev",
},
version
Expand All @@ -91,7 +91,7 @@ impl FlowNode for Node {
"Microsoft.OHCL.Kernel{}.{}{}-{}.tar.gz",
match kind {
OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => {
""
".Dev"
}
OpenhclKernelPackageKind::Dev | OpenhclKernelPackageKind::CvmDev => {
".Dev"
Expand Down
18 changes: 8 additions & 10 deletions vmm_tests/vmm_tests/tests/tests/x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use petri::ShutdownKind;
use petri::openvmm::PetriVmConfigOpenVmm;
use petri::pipette::cmd;
use petri_artifacts_common::tags::OsFlavor;
use petri_artifacts_vmm_test::artifacts::openhcl_igvm::LATEST_STANDARD_DEV_KERNEL_X64;
use petri_artifacts_vmm_test::artifacts::openhcl_igvm::LATEST_STANDARD_X64;
use vmm_core_defs::HaltReason;
use vmm_test_macros::openvmm_test;
use vmm_test_macros::vmm_test;
Expand Down Expand Up @@ -305,7 +305,7 @@ async fn battery_capacity(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Er

fn configure_for_sidecar(
config: Box<dyn PetriVmConfig>,
igvm: ResolvedArtifact<LATEST_STANDARD_DEV_KERNEL_X64>,
igvm: ResolvedArtifact<LATEST_STANDARD_X64>,
proc_count: u32,
) -> Box<dyn PetriVmConfig> {
config
Expand All @@ -323,19 +323,17 @@ fn configure_for_sidecar(
})
}

// Sidecar currently requires the dev kernel build.
//
// Use UEFI so that the guest doesn't access the other APs, causing hot adds
// into VTL2 Linux.
//
// Sidecar isn't supported on aarch64 yet.
#[vmm_test(
openvmm_openhcl_uefi_x64(none) [LATEST_STANDARD_DEV_KERNEL_X64],
// TODO: debug why boot is failing hyperv_openhcl_uefi_x64(none) [LATEST_STANDARD_DEV_KERNEL_X64],
openvmm_openhcl_uefi_x64(none) [LATEST_STANDARD_X64],
// TODO: debug why boot is failing hyperv_openhcl_uefi_x64(none) [LATEST_STANDARD_X64],
)]
async fn sidecar_aps_unused(
config: Box<dyn PetriVmConfig>,
(igvm,): (ResolvedArtifact<LATEST_STANDARD_DEV_KERNEL_X64>,),
(igvm,): (ResolvedArtifact<LATEST_STANDARD_X64>,),
) -> Result<(), anyhow::Error> {
let proc_count = 4;
let mut vm = configure_for_sidecar(config, igvm, proc_count)
Expand Down Expand Up @@ -367,12 +365,12 @@ async fn sidecar_aps_unused(
}

#[vmm_test(
openvmm_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_DEV_KERNEL_X64],
// TODO: debug why boot is failing hyperv_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_DEV_KERNEL_X64],
openvmm_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_X64],
// TODO: debug why boot is failing hyperv_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_X64],
)]
async fn sidecar_boot(
config: Box<dyn PetriVmConfig>,
(igvm,): (ResolvedArtifact<LATEST_STANDARD_DEV_KERNEL_X64>,),
(igvm,): (ResolvedArtifact<LATEST_STANDARD_X64>,),
) -> Result<(), anyhow::Error> {
let (vm, agent) = configure_for_sidecar(config, igvm, 4).run().await?;
agent.power_off().await?;
Expand Down