kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: move function to send dirty pages into transport module

Browse Source 
On-behalf-of: SAP sebastian.eydam@sap.com
Signed-off-by: Sebastian Eydam <sebastian.eydam@cyberus-technology.de>
This commit is contained in:
Sebastian Eydam
2026-03-09 10:13:09 +01:00
committed by Bo Chen
parent 693cdccbb0
commit e03c0f7708
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vmm/src/lib.rs
View File

@@ -1157,33 +1157,6 @@ impl Vmm {
Ok(())
}
/// Transmits the given [`MemoryRangeTable`] over the wire if there is at
/// least one region.
///
/// Sends a memory migration request, the range table, and the corresponding
/// guest memory regions over the given socket. Waits for acknowledgment
/// from the destination.
fn vm_send_dirty_pages(
vm: &mut Vm,
socket: &mut SocketStream,
table: &MemoryRangeTable,
) -> result::Result<(), MigratableError> {
if table.regions().is_empty() {
return Ok(());
}
Request::memory(table.length()).write_to(socket)?;
table.write_to(socket)?;
// And then the memory itself
vm.send_memory_regions(table, socket)?;
migration_transport::expect_ok_response(
socket,
MigratableError::MigrateSend(anyhow!("Error during dirty memory migration")),
)?;
Ok(())
}
/// Performs the initial memory transmission (iteration zero) plus a
/// variable number of memory iterations with the goal to eventually migrate
/// the VM in a reasonably small downtime.
@@ -1214,7 +1187,7 @@ impl Vmm {
// Send the current dirty pages
let transfer_begin = Instant::now();
Self::vm_send_dirty_pages(vm, socket, &iteration_table)?;
migration_transport::vm_send_dirty_pages(vm, socket, &iteration_table)?;
let transfer_duration = transfer_begin.elapsed();
ctx.update_metrics_after_transfer(transfer_begin, transfer_duration);
@@ -1356,7 +1329,7 @@ impl Vmm {
ctx.update_metrics_before_transfer(iteration_begin, &final_table);
let transfer_begin = Instant::now();
Vmm::vm_send_dirty_pages(vm, socket, &final_table)?;
migration_transport::vm_send_dirty_pages(vm, socket, &final_table)?;
let transfer_duration = transfer_begin.elapsed();
ctx.update_metrics_after_transfer(transfer_begin, transfer_duration);
ctx.iteration += 1;

30
vmm/src/migration_transport.rs
View File

@@ -12,9 +12,10 @@ use std::result::Result;
use anyhow::{Context, anyhow};
use log::info;
use serde_json;
use vm_migration::protocol::{Request, Response};
use vm_migration::protocol::{MemoryRangeTable, Request, Response};
use vm_migration::{MigratableError, Snapshot};
use crate::vm::Vm;
use crate::{SocketStream, VmMigrationConfig};
/// Extract a UNIX socket path from a "unix:" migration URL.
@@ -135,3 +136,30 @@ pub(crate) fn send_state(
MigratableError::MigrateSend(anyhow!("Error during state migration")),
)
}
/// Transmits the given [`MemoryRangeTable`] over the wire if there is at
/// least one region.
///
/// Sends a memory migration request, the range table, and the corresponding
/// guest memory regions over the given socket. Waits for acknowledgment
/// from the destination.
pub(crate) fn vm_send_dirty_pages(
vm: &mut Vm,
socket: &mut SocketStream,
table: &MemoryRangeTable,
) -> Result<(), MigratableError> {
if table.regions().is_empty() {
return Ok(());
}
Request::memory(table.length()).write_to(socket)?;
table.write_to(socket)?;
// And then the memory itself
vm.send_memory_regions(table, socket)?;
expect_ok_response(
socket,
MigratableError::MigrateSend(anyhow!("Error during dirty memory migration")),
)?;
Ok(())
}