Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 4 deletions bin/propolis-server/src/lib/initializer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,6 @@ impl MachineInitializer<'_> {
fn generate_acpi_tables(
&self,
acpi_variant: acpi::AcpiVariant,
cpus: u8,
) -> Result<fwcfg::formats::AcpiTables, MachineInitError> {
let (lowmem, _) = get_spec_guest_ram_limits(self.spec);
let generators: Vec<_> = self
Expand All @@ -1491,9 +1490,10 @@ impl MachineInitializer<'_> {
PCI_MMIO32_END as u64,
)?;

let apic_ids = self.machine.apic_ids();
let config = &fwcfg::formats::AcpiConfig {
acpi_variant,
num_cpus: cpus,
apic_ids: &apic_ids,
pci_window_32,
pci_window_64: fwcfg::formats::PciWindow::empty(),
dsdt_generators: &generators,
Expand Down Expand Up @@ -1550,7 +1550,7 @@ impl MachineInitializer<'_> {
.insert_named("etc/e820", e820_entry)
.map_err(|e| MachineInitError::FwcfgInsertFailed("e820", e))?;

let acpi_entries = self.generate_acpi_tables(acpi_variant, cpus)?;
let acpi_entries = self.generate_acpi_tables(acpi_variant)?;
fwcfg.insert_named("etc/acpi/tables", acpi_entries.tables).map_err(
|e| MachineInitError::FwcfgInsertFailed("acpi/tables", e),
)?;
Expand Down Expand Up @@ -1585,7 +1585,8 @@ impl MachineInitializer<'_> {
/// tracking their kstats.
pub async fn initialize_cpus(&mut self) -> Result<(), MachineInitError> {
let hv_interface = self.machine.guest_hv_interface.as_ref();
for vcpu in self.machine.vcpus.iter() {
let max_vcpuid = self.machine.max_vcpu_id();
for vcpu in self.machine.vcpus() {
// Report that the guest is running on bhyve.
//
// The CPUID set in the spec is not allowed to contain any leaves in
Expand Down Expand Up @@ -1615,6 +1616,7 @@ impl MachineInitializer<'_> {
NonZeroU8::new(self.spec.board.cpus).unwrap(),
true,
)
.with_max_vcpuid(max_vcpuid)
.with_vcpuid(vcpu.id)
.with_cache_topo()
.clear_cpu_topo(TopoKind::iter())
Expand Down
57 changes: 53 additions & 4 deletions bin/propolis-server/src/lib/migrate/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,14 @@
use serde::{Deserialize, Serialize};

use propolis_api_types::instance::ReplacementComponent;
use propolis_api_types_versions::{v1, v2, v3, v6};
use propolis_api_types_versions::{v1, v2, v3, v6, v8};

use std::collections::BTreeMap;

use crate::migrate::MigrateError;
use crate::spec::{api_spec_v1, api_spec_v2, api_spec_v3, api_spec_v6, Spec};
use crate::spec::{
api_spec_v1, api_spec_v2, api_spec_v3, api_spec_v6, api_spec_v8, Spec,
};

/// A wrapper for one of any supported `InstanceSpec` that describe a
/// to-be-migrated VM.
Expand All @@ -113,6 +115,7 @@ pub(crate) enum VersionedInstanceSpec {
V2(v2::instance_spec::InstanceSpec),
V3(v3::instance_spec::InstanceSpec),
V6(v6::instance_spec::InstanceSpec),
V8(v8::instance_spec::InstanceSpec),
}

impl VersionedInstanceSpec {
Expand Down Expand Up @@ -142,9 +145,13 @@ impl VersionedInstanceSpec {
TryInto::<v3::instance_spec::InstanceSpec>::try_into(spec.clone())
{
VersionedInstanceSpec::V3(v3_spec)
} else if let Ok(v6_spec) =
TryInto::<v6::instance_spec::InstanceSpec>::try_into(spec.clone())
{
VersionedInstanceSpec::V6(v6_spec)
} else {
VersionedInstanceSpec::V6(
Into::<v6::instance_spec::InstanceSpec>::into(spec.clone()),
VersionedInstanceSpec::V8(
Into::<v8::instance_spec::InstanceSpec>::into(spec.clone()),
)
};
Ok(versioned)
Expand Down Expand Up @@ -186,8 +193,50 @@ impl VersionedInstanceSpec {
.map_err(|e| MigrateError::PreambleParse(e.to_string()))?
.finish()
}
VersionedInstanceSpec::V8(mut source_spec) => {
api_spec_v8::amend(&mut source_spec, replacements)?;

api_spec_v8::v8_to_spec_builder(source_spec)
.map_err(|e| MigrateError::PreambleParse(e.to_string()))?
.finish()
}
};

Ok(amended_spec)
}
}

#[cfg(test)]
mod test {
use propolis_api_types_versions::latest::components::board::GuestHypervisorInterface;

use super::VersionedInstanceSpec;
use crate::spec::api_spec_v8::test::{
spec_with_interface, v8_only_interfaces,
};

#[test]
fn default_interface_uses_oldest_version() {
let spec = spec_with_interface(GuestHypervisorInterface::default());
assert!(matches!(
VersionedInstanceSpec::from_spec(&spec).unwrap(),
VersionedInstanceSpec::V1(_)
));
}

#[test]
fn v8_only_interfaces_migrate_as_v8() {
for iface in v8_only_interfaces() {
let spec = spec_with_interface(iface.clone());
let versioned = VersionedInstanceSpec::from_spec(&spec).unwrap();
let VersionedInstanceSpec::V8(ref v8_spec) = versioned else {
panic!("expected a v8 spec for interface {iface:?}");
};
assert_eq!(v8_spec.board.guest_hv_interface, iface);

let roundtrip =
versioned.into_amended_spec(&Default::default()).unwrap();
assert_eq!(roundtrip.board.guest_hv_interface, iface);
}
}
}
19 changes: 12 additions & 7 deletions bin/propolis-server/src/lib/spec/api_spec_v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ use std::collections::BTreeMap;

use propolis_api_types::instance::ReplacementComponent;
use propolis_api_types::instance_spec::{
components::{
board::Board as InstanceSpecBoard,
devices::{BootSettings, SerialPort as SerialPortDesc},
},
components::devices::{BootSettings, SerialPort as SerialPortDesc},
SpecKey,
};
use propolis_api_types_versions::{v1, v2, v3, v6};
use propolis_api_types_versions::{v1, v2, v3, v6, v8};

#[cfg(feature = "falcon")]
use propolis_api_types::instance_spec::components::devices::SoftNpuPort as SoftNpuPortSpec;
Expand Down Expand Up @@ -136,11 +133,19 @@ impl TryFrom<Spec> for v1::instance_spec::InstanceSpec {
spec.components.insert(key, val);
}

let board = InstanceSpecBoard {
// Guest hypervisor interface features added in v8 can't be expressed
// in a v1 board.
let guest_hv_interface = board.guest_hv_interface.try_into().map_err(
|e: v8::components::board::InvalidV1GuestHypervisorInterface| {
LegacyApiSpecError::IncompatibleComponent(e.to_string())
},
)?;

let board = v1::components::board::Board {
cpus: board.cpus,
memory_mb: board.memory_mb,
chipset: board.chipset,
guest_hv_interface: board.guest_hv_interface,
guest_hv_interface,
cpuid: Some(cpuid.into_instance_spec_cpuid()),
};
let mut spec = v1::instance_spec::InstanceSpec {
Expand Down
5 changes: 3 additions & 2 deletions bin/propolis-server/src/lib/spec/api_spec_v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ mod test {
cpus: 4,
memory_mb: 512,
chipset: Chipset::I440Fx(I440Fx { enable_pcie: false }),
guest_hv_interface: GuestHypervisorInterface::Bhyve,
guest_hv_interface: GuestHypervisorInterface::default(),
// Providing *any* CPUID settings keeps Propolis from querying
// bhyve for defaults to use instead, which requires .. byhve
// *and* VMM access. Provide a (useless) empty CPUID set so this
Expand All @@ -122,7 +122,8 @@ mod test {
.expect("SMBIOS type 1 input preserved");
assert_eq!(&smbios_input, smbios);

let v6_spec = v6::instance_spec::InstanceSpec::from(spec.clone());
let v6_spec =
v6::instance_spec::InstanceSpec::try_from(spec.clone()).unwrap();
let smbios =
v6_spec.smbios.as_ref().expect("SMBIOS type 1 input preserved");
assert_eq!(&smbios_input, smbios);
Expand Down
5 changes: 3 additions & 2 deletions bin/propolis-server/src/lib/spec/api_spec_v3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ mod test {
cpus: 4,
memory_mb: 512,
chipset: Chipset::I440Fx(I440Fx { enable_pcie: false }),
guest_hv_interface: GuestHypervisorInterface::Bhyve,
guest_hv_interface: GuestHypervisorInterface::default(),
// Providing *any* CPUID settings keeps Propolis from querying
// bhyve for defaults to use instead, which requires .. byhve
// *and* VMM access. Provide a (useless) empty CPUID set so this
Expand Down Expand Up @@ -179,7 +179,8 @@ mod test {
.finish();
assert!(spec.vsock.is_some());

let v6_spec = v6::instance_spec::InstanceSpec::from(spec.clone());
let v6_spec =
v6::instance_spec::InstanceSpec::try_from(spec.clone()).unwrap();
let v6_comp: v6::instance_spec::Component = vsock_comp.clone();
assert_eq!(v6_spec.components.get(&vsock_id), Some(&v6_comp));

Expand Down
34 changes: 18 additions & 16 deletions bin/propolis-server/src/lib/spec/api_spec_v6.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@ use std::collections::BTreeMap;

use propolis_api_types::instance::ReplacementComponent;
use propolis_api_types::instance_spec::SpecKey;
use propolis_api_types_versions::{v3, v6};
use propolis_api_types_versions::{v3, v6, v8};

use super::{builder::SpecBuilder, ApiSpecError, Disk, Spec, StorageDevice};
use super::{
builder::SpecBuilder, ApiSpecError, Disk, LegacyApiSpecError, Spec,
StorageDevice,
};
use crate::migrate::MigrateError;
use crate::spec::api_spec_latest;

impl From<Spec> for v6::instance_spec::InstanceSpec {
fn from(mut val: Spec) -> Self {
impl TryFrom<Spec> for v6::instance_spec::InstanceSpec {
type Error = LegacyApiSpecError;

fn try_from(mut val: Spec) -> Result<Self, Self::Error> {
// v6 adds a new field on NvmeDisk. Such disks probably can't be
// converted to v3 components and would cause a conversion from
// Spec->v3::instance_spec::InstanceSpec to fail. So, extract those
Expand All @@ -36,15 +41,7 @@ impl From<Spec> for v6::instance_spec::InstanceSpec {
}
val.disks.retain(|_, disk| !v6_only_disk(disk));

let v3_spec: v3::instance_spec::InstanceSpec =
val.try_into().unwrap_or_else(|e| {
unreachable!(
"Converting to Spec without v6 bits to v3 failed: {e}. \
This is currently impossible. When Spec to \
v6::instance_spec::InstanceSpec becomes fallible, \
this should `?`."
);
});
let v3_spec: v3::instance_spec::InstanceSpec = val.try_into()?;

let mut spec: v6::instance_spec::InstanceSpec = v3_spec.into();

Expand Down Expand Up @@ -78,7 +75,7 @@ impl From<Spec> for v6::instance_spec::InstanceSpec {
insert_component(&mut spec, backend_id, backend_component);
}

spec
Ok(spec)
}
}

Expand All @@ -88,10 +85,15 @@ impl From<Spec> for v6::instance_spec::InstanceSpec {
pub(crate) fn v6_to_spec_builder(
value: v6::instance_spec::InstanceSpec,
) -> Result<SpecBuilder, ApiSpecError> {
api_spec_latest::latest_to_spec_builder(value)
// Converting v6 to v8 is lossless, so just do that and piggyback on the
// latest `InstanceSpec->SpecBuilder`.
let v8_spec: v8::instance_spec::InstanceSpec = value.into();
api_spec_latest::latest_to_spec_builder(v8_spec)
}

fn amend_component(
// v8 instance specs use the same `Component` type as v6, so this is also used
// to amend v8 specs.
pub(crate) fn amend_component(
id: &SpecKey,
to_amend: &mut v6::instance_spec::Component,
replacement: &ReplacementComponent,
Expand Down
Loading
Loading