Skip to content

vmm: live migration asynchronization (dedicated thread) #24

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

Merged
phip1611 merged 5 commits into from
Nov 24, 2025
Merged

vmm: live migration asynchronization (dedicated thread) #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f190bb3
vmm: migration: prepare EventFd for async migration events
phip1611 Nov 21, 2025
1419566
vmm: migration: handle in dedicated thread (make async)
phip1611 Nov 21, 2025
ac4b1e8
vmm: better VM ownership handling in context of live migration
phip1611 Oct 30, 2025
93e8d14
vmm: api: temporarily make VmSendMigration call blocking again
phip1611 Oct 30, 2025
86eb8a8
misc: fix typo and wording
phip1611 Nov 11, 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
2 changes: 1 addition & 1 deletion vm-migration/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub enum MigratableError {
#[error("Failed to complete migration for migratable component")]
CompleteMigration(#[source] anyhow::Error),

#[error("Failed to release a disk lock before the migration")]
#[error("Failed to release a disk lock")]
UnlockError(#[source] anyhow::Error),
}

Expand Down
54 changes: 52 additions & 2 deletions vmm/src/api/http/http_endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,22 @@

use std::fs::File;
use std::os::unix::io::IntoRawFd;
use std::sync::mpsc::Sender;
use std::sync::mpsc::{Receiver, Sender, SyncSender};
use std::sync::{LazyLock, Mutex};

use micro_http::{Body, Method, Request, Response, StatusCode, Version};
use vmm_sys_util::eventfd::EventFd;

/// Helper to make the VmSendMigration call blocking as long as a migration is ongoing.
#[allow(clippy::type_complexity)]
pub static ONGOING_LIVEMIGRATION: LazyLock<(
SyncSender<Result<(), vm_migration::MigratableError>>,
Mutex<Receiver<Result<(), vm_migration::MigratableError>>>,
)> = LazyLock::new(|| {
let (sender, receiver) = std::sync::mpsc::sync_channel(0);
(sender, Mutex::new(receiver))
});

#[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
use crate::api::VmCoredump;
use crate::api::http::{EndpointHandler, HttpError, error_response};
Expand Down Expand Up @@ -230,7 +241,6 @@ vm_action_put_handler_body!(VmRemoveDevice);
vm_action_put_handler_body!(VmResizeDisk);
vm_action_put_handler_body!(VmResizeZone);
vm_action_put_handler_body!(VmSnapshot);
vm_action_put_handler_body!(VmSendMigration);

#[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
vm_action_put_handler_body!(VmCoredump);
Expand Down Expand Up @@ -382,6 +392,46 @@ impl PutHandler for VmReceiveMigration {

impl GetHandler for VmReceiveMigration {}

// Special Handling for virtio-net Devices Backed by Network File Descriptors
//
// See above.
impl PutHandler for VmSendMigration {
fn handle_request(
&'static self,
api_notifier: EventFd,
api_sender: Sender<ApiRequest>,
body: &Option<Body>,
_files: Vec<File>,
) -> std::result::Result<Option<Body>, HttpError> {
if let Some(body) = body {
let res = self
.send(
api_notifier,
api_sender,
serde_json::from_slice(body.raw())?,
)
.map_err(HttpError::ApiError)?;

info!("live migration started");

let (_, receiver) = &*ONGOING_LIVEMIGRATION;

info!("waiting for live migration result");
let mig_res = receiver.lock().unwrap().recv().unwrap();
info!("received live migration result");

// We forward the migration error here to the guest
mig_res
.map(|_| res)
.map_err(|e| HttpError::ApiError(ApiError::VmSendMigration(e)))
} else {
Err(HttpError::BadRequest)
}
}
}

impl GetHandler for VmSendMigration {}

impl PutHandler for VmResize {
fn handle_request(
&'static self,
Expand Down
4 changes: 2 additions & 2 deletions vmm/src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ pub enum ApiError {
#[error("The VM could not be snapshotted")]
VmSnapshot(#[source] VmError),

/// The VM could not restored.
#[error("The VM could not restored")]
/// The VM could not be restored.
#[error("The VM could not be restored")]
VmRestore(#[source] VmError),

/// The VM could not be coredumped.
Expand Down
Loading
Loading