External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-08 22:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: MSHV needs gpa to retrieve dirty logs

Browse Source 
Right now, get_dirty_log API has two parameters,
slot and memory_size.
MSHV needs gpa to retrieve the page states. GPA is
needed as MSHV returns the state base on PFN.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam 2021-07-08 10:14:24 -07:00 committed by LIU Wei
parent 4abcb0a33c
commit fdecba6958
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/src/kvm/mod.rs
View File

@ -472,7 +472,7 @@ impl vm::Vm for KvmVm {
/// ///
/// Get dirty pages bitmap (one bit per page) /// Get dirty pages bitmap (one bit per page)
/// ///
fn get_dirty_log(&self, slot: u32, memory_size: u64) -> vm::Result<Vec<u64>> { fn get_dirty_log(&self, slot: u32, _base_gpa: u64, memory_size: u64) -> vm::Result<Vec<u64>> {
self.fd self.fd
.get_dirty_log(slot, memory_size as usize) .get_dirty_log(slot, memory_size as usize)
.map_err(|e| vm::HypervisorVmError::GetDirtyLog(e.into())) .map_err(|e| vm::HypervisorVmError::GetDirtyLog(e.into()))

13
hypervisor/src/mshv/mod.rs
View File

@ -33,6 +33,7 @@ use std::fs::File;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::sync::RwLock; use std::sync::RwLock;
const DIRTY_BITMAP_CLEAR_DIRTY: u64 = 0x4;
pub const PAGE_SHIFT: usize = 12; pub const PAGE_SHIFT: usize = 12;
#[derive(Debug, Default, Copy, Clone, Serialize, Deserialize)] #[derive(Debug, Default, Copy, Clone, Serialize, Deserialize)]
@ -895,10 +896,14 @@ impl vm::Vm for MshvVm {
/// ///
/// Get dirty pages bitmap (one bit per page) /// Get dirty pages bitmap (one bit per page)
/// ///
fn get_dirty_log(&self, _slot: u32, _memory_size: u64) -> vm::Result<Vec<u64>> { fn get_dirty_log(&self, _slot: u32, base_gpa: u64, memory_size: u64) -> vm::Result<Vec<u64>> {
Err(vm::HypervisorVmError::GetDirtyLog(anyhow!( self.fd
"get_dirty_log not implemented" .get_dirty_log(
))) base_gpa >> PAGE_SHIFT,
memory_size as usize,
DIRTY_BITMAP_CLEAR_DIRTY,
)
.map_err(|e| vm::HypervisorVmError::GetDirtyLog(e.into()))
} }
} }
pub use hv_cpuid_entry as CpuIdEntry; pub use hv_cpuid_entry as CpuIdEntry;

2
hypervisor/src/vm.rs
View File

@ -285,7 +285,7 @@ pub trait Vm: Send + Sync {
/// Stop logging dirty pages /// Stop logging dirty pages
fn stop_dirty_log(&self) -> Result<()>; fn stop_dirty_log(&self) -> Result<()>;
/// Get dirty pages bitmap /// Get dirty pages bitmap
fn get_dirty_log(&self, slot: u32, memory_size: u64) -> Result<Vec<u64>>; fn get_dirty_log(&self, slot: u32, base_gpa: u64, memory_size: u64) -> Result<Vec<u64>>;
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
/// Initalize TDX on this VM /// Initalize TDX on this VM
fn tdx_init(&self, cpuid: &CpuId, max_vcpus: u32) -> Result<()>; fn tdx_init(&self, cpuid: &CpuId, max_vcpus: u32) -> Result<()>;

2
vmm/src/memory_manager.rs
View File

@ -1502,7 +1502,7 @@ impl MemoryManager {
let page_size = 4096; // TODO: Does this need to vary? let page_size = 4096; // TODO: Does this need to vary?
let mut table = MemoryRangeTable::default(); let mut table = MemoryRangeTable::default();
for r in &self.guest_ram_mappings { for r in &self.guest_ram_mappings {
let vm_dirty_bitmap = self.vm.get_dirty_log(r.slot, r.size).map_err(|e| { let vm_dirty_bitmap = self.vm.get_dirty_log(r.slot, r.gpa, r.size).map_err(|e| {
MigratableError::MigrateSend(anyhow!("Error getting VM dirty log {}", e)) MigratableError::MigrateSend(anyhow!("Error getting VM dirty log {}", e))
})?; })?;
let vmm_dirty_bitmap = match self.guest_memory.memory().find_region(GuestAddress(r.gpa)) let vmm_dirty_bitmap = match self.guest_memory.memory().find_region(GuestAddress(r.gpa))