External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-24 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: mem: Port to VirtioCommon

Browse Source 
Use VirtioCommon to handle activate() preparation, reset() and Pausable.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-09-04 09:37:37 +01:00
parent 376babb21e
commit df8a55ab11
1 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
virtio-devices/src/mem.rs
View File

@ -40,7 +40,6 @@ use vm_migration::{Migratable, MigratableError, Pausable, Snapshottable, Transpo
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
const QUEUE_SIZE: u16 = 128; const QUEUE_SIZE: u16 = 128;
const NUM_QUEUES: usize = 1;
const QUEUE_SIZES: &[u16] = &[QUEUE_SIZE]; const QUEUE_SIZES: &[u16] = &[QUEUE_SIZE];
// Use 2 MiB alignment so transparent hugepages can be used by KVM. // Use 2 MiB alignment so transparent hugepages can be used by KVM.
@ -683,16 +682,9 @@ pub struct Mem {
common: VirtioCommon, common: VirtioCommon,
id: String, id: String,
resize: Resize, resize: Resize,
kill_evt: Option<EventFd>,
pause_evt: Option<EventFd>,
host_addr: u64, host_addr: u64,
host_fd: Option<RawFd>, host_fd: Option<RawFd>,
config: Arc<Mutex<VirtioMemConfig>>, config: Arc<Mutex<VirtioMemConfig>>,
queue_evts: Option<Vec<EventFd>>,
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
epoll_threads: Option<Vec<thread::JoinHandle<()>>>,
paused: Arc<AtomicBool>,
paused_sync: Arc<Barrier>,
seccomp_action: SeccompAction, seccomp_action: SeccompAction,
} }
@ -737,21 +729,17 @@ impl Mem {
Ok(Mem { Ok(Mem {
common: VirtioCommon { common: VirtioCommon {
device_type: VirtioDeviceType::TYPE_MEM as u32,
avail_features, avail_features,
paused_sync: Some(Arc::new(Barrier::new(2))),
queue_sizes: QUEUE_SIZES.to_vec(),
..Default::default() ..Default::default()
}, },
id, id,
resize, resize,
kill_evt: None,
pause_evt: None,
host_addr: region.as_ptr() as u64, host_addr: region.as_ptr() as u64,
host_fd, host_fd,
config: Arc::new(Mutex::new(config)), config: Arc::new(Mutex::new(config)),
queue_evts: None,
interrupt_cb: None,
epoll_threads: None,
paused: Arc::new(AtomicBool::new(false)),
paused_sync: Arc::new(Barrier::new(2)),
seccomp_action, seccomp_action,
}) })
} }
@ -759,7 +747,7 @@ impl Mem {
impl Drop for Mem { impl Drop for Mem {
fn drop(&mut self) { fn drop(&mut self) {
if let Some(kill_evt) = self.kill_evt.take() { if let Some(kill_evt) = self.common.kill_evt.take() {
// Ignore the result because there is nothing we can do about it. // Ignore the result because there is nothing we can do about it.
let _ = kill_evt.write(1); let _ = kill_evt.write(1);
} }
@ -768,11 +756,11 @@ impl Drop for Mem {
impl VirtioDevice for Mem { impl VirtioDevice for Mem {
fn device_type(&self) -> u32 { fn device_type(&self) -> u32 {
VirtioDeviceType::TYPE_MEM as u32 self.common.device_type
} }
fn queue_max_sizes(&self) -> &[u16] { fn queue_max_sizes(&self) -> &[u16] {
QUEUE_SIZES &self.common.queue_sizes
} }
fn features(&self) -> u64 { fn features(&self) -> u64 {
@ -794,43 +782,27 @@ impl VirtioDevice for Mem {
mut queues: Vec<Queue>, mut queues: Vec<Queue>,
mut queue_evts: Vec<EventFd>, mut queue_evts: Vec<EventFd>,
) -> ActivateResult { ) -> ActivateResult {
if queues.len() != NUM_QUEUES || queue_evts.len() != NUM_QUEUES { self.common.activate(&queues, &queue_evts, &interrupt_cb)?;
error!( let kill_evt = self
"Cannot perform activate. Expected {} queue(s), got {}", .common
NUM_QUEUES, .kill_evt
queues.len() .as_ref()
); .unwrap()
return Err(ActivateError::BadActivate); .try_clone()
}
let (self_kill_evt, kill_evt) = EventFd::new(EFD_NONBLOCK)
.and_then(|e| Ok((e.try_clone()?, e)))
.map_err(|e| { .map_err(|e| {
error!("failed creating kill EventFd pair: {}", e); error!("failed to clone kill_evt eventfd: {}", e);
ActivateError::BadActivate ActivateError::BadActivate
})?; })?;
self.kill_evt = Some(self_kill_evt); let pause_evt = self
.common
let (self_pause_evt, pause_evt) = EventFd::new(EFD_NONBLOCK) .pause_evt
.and_then(|e| Ok((e.try_clone()?, e))) .as_ref()
.unwrap()
.try_clone()
.map_err(|e| { .map_err(|e| {
error!("failed creating pause EventFd pair: {}", e); error!("failed to clone pause_evt eventfd: {}", e);
ActivateError::BadActivate ActivateError::BadActivate
})?; })?;
self.pause_evt = Some(self_pause_evt);
self.interrupt_cb = Some(interrupt_cb.clone());
let mut tmp_queue_evts: Vec<EventFd> = Vec::new();
for queue_evt in queue_evts.iter() {
// Save the queue EventFD as we need to return it on reset
// but clone it to pass into the thread.
tmp_queue_evts.push(queue_evt.try_clone().map_err(|e| {
error!("failed to clone queue EventFd: {}", e);
ActivateError::BadActivate
})?);
}
self.queue_evts = Some(tmp_queue_evts);
let config = self.config.lock().unwrap(); let config = self.config.lock().unwrap();
let mut handler = MemEpollHandler { let mut handler = MemEpollHandler {
@ -850,8 +822,8 @@ impl VirtioDevice for Mem {
pause_evt, pause_evt,
}; };
let paused = self.paused.clone(); let paused = self.common.paused.clone();
let paused_sync = self.paused_sync.clone(); let paused_sync = self.common.paused_sync.clone();
let mut epoll_threads = Vec::new(); let mut epoll_threads = Vec::new();
// Retrieve seccomp filter for virtio_mem thread // Retrieve seccomp filter for virtio_mem thread
let virtio_mem_seccomp_filter = get_seccomp_filter(&self.seccomp_action, Thread::VirtioMem) let virtio_mem_seccomp_filter = get_seccomp_filter(&self.seccomp_action, Thread::VirtioMem)
@ -861,7 +833,7 @@ impl VirtioDevice for Mem {
.spawn(move || { .spawn(move || {
if let Err(e) = SeccompFilter::apply(virtio_mem_seccomp_filter) { if let Err(e) = SeccompFilter::apply(virtio_mem_seccomp_filter) {
error!("Error applying seccomp filter: {:?}", e); error!("Error applying seccomp filter: {:?}", e);
} else if let Err(e) = handler.run(paused, paused_sync) { } else if let Err(e) = handler.run(paused, paused_sync.unwrap()) {
error!("Error running worker: {:?}", e); error!("Error running worker: {:?}", e);
} }
}) })
@ -870,31 +842,26 @@ impl VirtioDevice for Mem {
error!("failed to clone virtio-mem epoll thread: {}", e); error!("failed to clone virtio-mem epoll thread: {}", e);
ActivateError::BadActivate ActivateError::BadActivate
})?; })?;
self.epoll_threads = Some(epoll_threads); self.common.epoll_threads = Some(epoll_threads);
Ok(()) Ok(())
} }
fn reset(&mut self) -> Option<(Arc<dyn VirtioInterrupt>, Vec<EventFd>)> { fn reset(&mut self) -> Option<(Arc<dyn VirtioInterrupt>, Vec<EventFd>)> {
// We first must resume the virtio thread if it was paused. self.common.reset()
if self.pause_evt.take().is_some() { }
self.resume().ok()?; }
}
impl Pausable for Mem {
if let Some(kill_evt) = self.kill_evt.take() { fn pause(&mut self) -> result::Result<(), MigratableError> {
// Ignore the result because there is nothing we can do about it. self.common.pause()
let _ = kill_evt.write(1); }
}
fn resume(&mut self) -> result::Result<(), MigratableError> {
// Return the interrupt and queue EventFDs self.common.resume()
Some((
self.interrupt_cb.take().unwrap(),
self.queue_evts.take().unwrap(),
))
} }
} }
virtio_pausable!(Mem);
impl Snapshottable for Mem { impl Snapshottable for Mem {
fn id(&self) -> String { fn id(&self) -> String {
self.id.clone() self.id.clone()