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

hypervisor: Keep track of dirty memory slots for MSHV

Browse Source 
Keep the memory slots for enabling/disabling
dirty page tracking on MSHV.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam 2021-07-28 11:11:14 -07:00 committed by LIU Wei
parent fdecba6958
commit 6492496cc2
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@ pub use mshv_bindings::*;
pub use mshv_ioctls::IoEventAddress; pub use mshv_ioctls::IoEventAddress;
use mshv_ioctls::{set_registers_64, Mshv, NoDatamatch, VcpuFd, VmFd}; use mshv_ioctls::{set_registers_64, Mshv, NoDatamatch, VcpuFd, VmFd};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use std::sync::Arc; use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use vm::DataMatch; use vm::DataMatch;
// x86_64 dependencies // x86_64 dependencies
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
@ -31,7 +32,6 @@ pub use x86_64::*;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use std::fs::File; use std::fs::File;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::sync::RwLock;
const DIRTY_BITMAP_CLEAR_DIRTY: u64 = 0x4; const DIRTY_BITMAP_CLEAR_DIRTY: u64 = 0x4;
pub const PAGE_SHIFT: usize = 12; pub const PAGE_SHIFT: usize = 12;
@ -43,6 +43,11 @@ pub struct HvState {
pub use HvState as VmState; pub use HvState as VmState;
struct MshvDirtyLogSlot {
guest_pfn: u64,
memory_size: u64,
}
/// Wrapper over mshv system ioctls. /// Wrapper over mshv system ioctls.
pub struct MshvHypervisor { pub struct MshvHypervisor {
mshv: Mshv, mshv: Mshv,
@ -107,6 +112,7 @@ impl hypervisor::Hypervisor for MshvHypervisor {
msrs, msrs,
hv_state: hv_state_init(), hv_state: hv_state_init(),
vmmops: None, vmmops: None,
dirty_log_slots: Arc::new(RwLock::new(HashMap::new())),
})) }))
} }
/// ///
@ -682,6 +688,7 @@ pub struct MshvVm {
// Hypervisor State // Hypervisor State
hv_state: Arc<RwLock<HvState>>, hv_state: Arc<RwLock<HvState>>,
vmmops: Option<Arc<dyn vm::VmmOps>>, vmmops: Option<Arc<dyn vm::VmmOps>>,
dirty_log_slots: Arc<RwLock<HashMap<u64, MshvDirtyLogSlot>>>,
} }
fn hv_state_init() -> Arc<RwLock<HvState>> { fn hv_state_init() -> Arc<RwLock<HvState>> {
@ -807,6 +814,17 @@ impl vm::Vm for MshvVm {
/// Creates a guest physical memory region. /// Creates a guest physical memory region.
fn create_user_memory_region(&self, user_memory_region: MemoryRegion) -> vm::Result<()> { fn create_user_memory_region(&self, user_memory_region: MemoryRegion) -> vm::Result<()> {
// No matter read only or not we keep track the slots.
// For readonly hypervisor can enable the dirty bits,
// but a VM exit happens before setting the dirty bits
self.dirty_log_slots.write().unwrap().insert(
user_memory_region.guest_pfn,
MshvDirtyLogSlot {
guest_pfn: user_memory_region.guest_pfn,
memory_size: user_memory_region.size,
},
);
self.fd self.fd
.map_user_memory(user_memory_region) .map_user_memory(user_memory_region)
.map_err(|e| vm::HypervisorVmError::CreateUserMemory(e.into()))?; .map_err(|e| vm::HypervisorVmError::CreateUserMemory(e.into()))?;
@ -815,6 +833,12 @@ impl vm::Vm for MshvVm {
/// Removes a guest physical memory region. /// Removes a guest physical memory region.
fn remove_user_memory_region(&self, user_memory_region: MemoryRegion) -> vm::Result<()> { fn remove_user_memory_region(&self, user_memory_region: MemoryRegion) -> vm::Result<()> {
// Remove the corresponding entry from "self.dirty_log_slots" if needed
self.dirty_log_slots
.write()
.unwrap()
.remove(&user_memory_region.guest_pfn);
self.fd self.fd
.unmap_user_memory(user_memory_region) .unmap_user_memory(user_memory_region)
.map_err(|e| vm::HypervisorVmError::RemoveUserMemory(e.into()))?; .map_err(|e| vm::HypervisorVmError::RemoveUserMemory(e.into()))?;