Skip to content

openhcl servicing: fix breaking servicing state change for optional vmgs #1707

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

Closed
wants to merge 1 commit into from
Closed

openhcl servicing: fix breaking servicing state change for optional vmgs #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 46 additions & 8 deletions openhcl/underhill_core/src/dispatch/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,14 +693,51 @@ impl LoadedVm {
};

let units = self.save_units().await.context("state unit save failed")?;
let vmgs = if let Some((vmgs_thin_client, vmgs_disk_metadata, _)) = self.vmgs.as_ref() {
Some((
vmgs_thin_client.save().await.context("vmgs save failed")?,
vmgs_disk_metadata.clone(),
))
} else {
None
};
let (vmgs, use_vmgs) =
if let Some((vmgs_thin_client, vmgs_disk_metadata, _)) = self.vmgs.as_ref() {
(
(
vmgs_thin_client.save().await.context("vmgs save failed")?,
vmgs_disk_metadata.clone(),
),
true,
)
} else {
(
// To avoid changing the type of the existing vmgs field
// in the servicing state, populate the VMGS saved state
// with obviously-wrong values.
(
vmgs::save_restore::state::SavedVmgsState {
active_header_index: usize::MAX,
active_header_sequence_number: u32::MAX,
version: u32::MAX,
fcbs: Vec::new(),
encryption_algorithm: u16::MAX,
datastore_key_count: u8::MAX,
active_datastore_key_index: None,
datastore_keys: [[u8::MAX; 32]; 2],
metadata_key: [u8::MAX; 32],
encrypted_metadata_keys: std::array::from_fn(|_| {
vmgs::save_restore::state::SavedVmgsEncryptionKey {
nonce: [u8::MAX; 12],
authentication_tag: [u8::MAX; 16],
encryption_key: [u8::MAX; 32],
}
}),
},
disk_get_vmgs::save_restore::SavedBlockStorageMetadata {
capacity: u64::MAX,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i feel like MAX is worse than 0 for some of these values? IE sizes and count seem like 0 should be better?

logical_sector_size: u32::MAX,
sector_count: u64::MAX,
sector_size: u32::MAX,
physical_sector_size: u32::MAX,
max_transfer_size_bytes: u32::MAX,
},
),
false,
)
};

// Only save dma manager state if we are expected to keep VF devices
// alive across save. Otherwise, don't persist the state at all, as
Expand Down Expand Up @@ -731,6 +768,7 @@ impl LoadedVm {
nvme_state,
dma_manager_state,
vmbus_client,
use_vmgs,
},
units,
};
Expand Down
9 changes: 6 additions & 3 deletions openhcl/underhill_core/src/servicing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ mod state {
pub flush_logs_result: Option<FlushLogsResult>,
/// VMGS related saved state
#[mesh(6)]
pub vmgs: Option<(
pub vmgs: (
vmgs::save_restore::state::SavedVmgsState,
disk_get_vmgs::save_restore::SavedBlockStorageMetadata,
)>,
),
/// Intercept the host-provided shutdown IC device.
#[mesh(7)]
pub overlay_shutdown_device: bool,
Expand All @@ -84,6 +84,8 @@ mod state {
pub dma_manager_state: Option<OpenhclDmaManagerState>,
#[mesh(10002)]
pub vmbus_client: Option<vmbus_client::SavedState>,
#[mesh(10003)]
pub use_vmgs: bool,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we use an enum or bool for future compatability, or do we not think we will need anything else?

}

#[derive(Protobuf)]
Expand Down Expand Up @@ -232,6 +234,7 @@ pub mod transposed {
nvme_state,
dma_manager_state,
vmbus_client,
use_vmgs,
} = state;

OptionServicingInitState {
Expand All @@ -243,7 +246,7 @@ pub mod transposed {
netvsp_state: Some(netvsp_state),
},
flush_logs_result: Some(flush_logs_result),
vmgs,
vmgs: use_vmgs.then_some(vmgs),
overlay_shutdown_device: Some(overlay_shutdown_device),
nvme_state: Some(nvme_state),
dma_manager_state: Some(dma_manager_state),
Expand Down