Skip to content
Merged
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
3 changes: 3 additions & 0 deletions openhcl/underhill_core/src/dispatch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,9 @@ impl LoadedVm {
// Only save NVMe state when there are NVMe controllers and keep alive
// was enabled.
let nvme_state = if let Some(n) = &self.nvme_manager {
// DEVNOTE: A subtlety here is that the act of saving the NVMe state also causes the driver
// to enter a state where subsequent teardown operations will noop. There is a STRONG
// correlation between save/restore and keepalive.
n.save(vf_keepalive_flag)
.instrument(tracing::info_span!("nvme_manager_save", CVM_ALLOWED))
.await
Expand Down
3 changes: 0 additions & 3 deletions vm/devices/storage/disk_nvme/nvme_driver/src/queue_pair.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@ impl<T: AerHandler> QueuePair<T> {
};
let dma_client = device.dma_client();

// TODO: Keepalive: Detect when the allocation came from outside
// the private pool and put the device in a degraded state, so it
// is possible to inspect that a servicing with keepalive will fail.
let mem = dma_client
.allocate_dma_buffer(total_size)
.context("failed to allocate memory for queues")?;
Expand Down