mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-27 23:23:09 +00:00
virtio-devices: mem: Port to EpollHelper
Migrate to EpollHelper so as to remove code that is duplicated between multiple virtio devices. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
d4754e18f9
commit
66efe3cf53
@ -14,16 +14,17 @@
|
|||||||
|
|
||||||
use super::Error as DeviceError;
|
use super::Error as DeviceError;
|
||||||
use super::{
|
use super::{
|
||||||
ActivateError, ActivateResult, DescriptorChain, DeviceEventT, Queue, VirtioDevice,
|
ActivateError, ActivateResult, DescriptorChain, EpollHelper, EpollHelperError,
|
||||||
VirtioDeviceType, VIRTIO_F_VERSION_1,
|
EpollHelperHandler, Queue, VirtioDevice, VirtioDeviceType, EPOLL_HELPER_EVENT_LAST,
|
||||||
|
VIRTIO_F_VERSION_1,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{VirtioInterrupt, VirtioInterruptType};
|
use crate::{VirtioInterrupt, VirtioInterruptType};
|
||||||
use libc::EFD_NONBLOCK;
|
use libc::EFD_NONBLOCK;
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::fs::File;
|
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::mem::size_of;
|
use std::mem::size_of;
|
||||||
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
|
use std::os::unix::io::{AsRawFd, RawFd};
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||||
use std::sync::mpsc;
|
use std::sync::mpsc;
|
||||||
@ -84,13 +85,9 @@ const VIRTIO_MEM_REQ_UNPLUG_ALL: u16 = 2;
|
|||||||
const VIRTIO_MEM_REQ_STATE: u16 = 3;
|
const VIRTIO_MEM_REQ_STATE: u16 = 3;
|
||||||
|
|
||||||
// Get resize event.
|
// Get resize event.
|
||||||
const RESIZE_EVENT: DeviceEventT = 0;
|
const RESIZE_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 1;
|
||||||
// New descriptors are pending on the virtio queue.
|
// New descriptors are pending on the virtio queue.
|
||||||
const QUEUE_AVAIL_EVENT: DeviceEventT = 1;
|
const QUEUE_AVAIL_EVENT: u16 = EPOLL_HELPER_EVENT_LAST + 2;
|
||||||
// The device has been dropped.
|
|
||||||
const KILL_EVENT: DeviceEventT = 2;
|
|
||||||
// The device should be paused.
|
|
||||||
const PAUSE_EVENT: DeviceEventT = 3;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
@ -592,90 +589,32 @@ impl MemEpollHandler {
|
|||||||
used_count > 0
|
used_count > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run(&mut self, paused: Arc<AtomicBool>) -> result::Result<(), DeviceError> {
|
fn run(&mut self, paused: Arc<AtomicBool>) -> result::Result<(), EpollHelperError> {
|
||||||
// Create the epoll file descriptor
|
let mut helper = EpollHelper::new(&self.kill_evt, &self.pause_evt)?;
|
||||||
let epoll_fd = epoll::create(true).map_err(DeviceError::EpollCreateFd)?;
|
helper.add_event(self.resize.evt.as_raw_fd(), RESIZE_EVENT)?;
|
||||||
// Use 'File' to enforce closing on 'epoll_fd'
|
helper.add_event(self.queue_evt.as_raw_fd(), QUEUE_AVAIL_EVENT)?;
|
||||||
let epoll_file = unsafe { File::from_raw_fd(epoll_fd) };
|
helper.run(paused, self)?;
|
||||||
|
|
||||||
// Add events
|
Ok(())
|
||||||
epoll::ctl(
|
}
|
||||||
epoll_file.as_raw_fd(),
|
|
||||||
epoll::ControlOptions::EPOLL_CTL_ADD,
|
|
||||||
self.resize.evt.as_raw_fd(),
|
|
||||||
epoll::Event::new(epoll::Events::EPOLLIN, u64::from(RESIZE_EVENT)),
|
|
||||||
)
|
|
||||||
.map_err(DeviceError::EpollCtl)?;
|
|
||||||
|
|
||||||
epoll::ctl(
|
|
||||||
epoll_file.as_raw_fd(),
|
|
||||||
epoll::ControlOptions::EPOLL_CTL_ADD,
|
|
||||||
self.queue_evt.as_raw_fd(),
|
|
||||||
epoll::Event::new(epoll::Events::EPOLLIN, u64::from(QUEUE_AVAIL_EVENT)),
|
|
||||||
)
|
|
||||||
.map_err(DeviceError::EpollCtl)?;
|
|
||||||
|
|
||||||
epoll::ctl(
|
|
||||||
epoll_file.as_raw_fd(),
|
|
||||||
epoll::ControlOptions::EPOLL_CTL_ADD,
|
|
||||||
self.kill_evt.as_raw_fd(),
|
|
||||||
epoll::Event::new(epoll::Events::EPOLLIN, u64::from(KILL_EVENT)),
|
|
||||||
)
|
|
||||||
.map_err(DeviceError::EpollCtl)?;
|
|
||||||
|
|
||||||
epoll::ctl(
|
|
||||||
epoll_file.as_raw_fd(),
|
|
||||||
epoll::ControlOptions::EPOLL_CTL_ADD,
|
|
||||||
self.pause_evt.as_raw_fd(),
|
|
||||||
epoll::Event::new(epoll::Events::EPOLLIN, u64::from(PAUSE_EVENT)),
|
|
||||||
)
|
|
||||||
.map_err(DeviceError::EpollCtl)?;
|
|
||||||
|
|
||||||
const EPOLL_EVENTS_LEN: usize = 100;
|
|
||||||
let mut events = vec![epoll::Event::new(epoll::Events::empty(), 0); EPOLL_EVENTS_LEN];
|
|
||||||
|
|
||||||
// Before jumping into the epoll loop, check if the device is expected
|
|
||||||
// to be in a paused state. This is helpful for the restore code path
|
|
||||||
// as the device thread should not start processing anything before the
|
|
||||||
// device has been resumed.
|
|
||||||
while paused.load(Ordering::SeqCst) {
|
|
||||||
thread::park();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
'epoll: loop {
|
impl EpollHelperHandler for MemEpollHandler {
|
||||||
let num_events = match epoll::wait(epoll_file.as_raw_fd(), -1, &mut events[..]) {
|
fn handle_event(&mut self, _helper: &mut EpollHelper, event: u16) -> bool {
|
||||||
Ok(res) => res,
|
match event {
|
||||||
Err(e) => {
|
|
||||||
if e.kind() == io::ErrorKind::Interrupted {
|
|
||||||
// It's well defined from the epoll_wait() syscall
|
|
||||||
// documentation that the epoll loop can be interrupted
|
|
||||||
// before any of the requested events occurred or the
|
|
||||||
// timeout expired. In both those cases, epoll_wait()
|
|
||||||
// returns an error of type EINTR, but this should not
|
|
||||||
// be considered as a regular error. Instead it is more
|
|
||||||
// appropriate to retry, by calling into epoll_wait().
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return Err(DeviceError::EpollWait(e));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
for event in events.iter().take(num_events) {
|
|
||||||
let ev_type = event.data as u16;
|
|
||||||
|
|
||||||
match ev_type {
|
|
||||||
RESIZE_EVENT => {
|
RESIZE_EVENT => {
|
||||||
if let Err(e) = self.resize.evt.read() {
|
if let Err(e) = self.resize.evt.read() {
|
||||||
return Err(DeviceError::EpollHander(format!(
|
error!("Failed to get resize event: {:?}", e);
|
||||||
"Failed to get resize event: {:?}",
|
return true;
|
||||||
e
|
|
||||||
)));
|
|
||||||
} else {
|
} else {
|
||||||
let size = self.resize.get_size();
|
let size = self.resize.get_size();
|
||||||
let mut config = self.config.lock().unwrap();
|
let mut config = self.config.lock().unwrap();
|
||||||
let mut signal_error = false;
|
let mut signal_error = false;
|
||||||
let r = if config.requested_size == size {
|
let r = if config.requested_size == size {
|
||||||
Err(Error::ResizeInval(format!("Virtio-mem resize {} is same with current config.requested_size", size)))
|
Err(Error::ResizeInval(format!(
|
||||||
|
"Virtio-mem resize {} is same with current config.requested_size",
|
||||||
|
size
|
||||||
|
)))
|
||||||
} else if size > config.region_size {
|
} else if size > config.region_size {
|
||||||
let region_size = config.region_size;
|
let region_size = config.region_size;
|
||||||
Err(Error::ResizeInval(format!(
|
Err(Error::ResizeInval(format!(
|
||||||
@ -694,75 +633,41 @@ impl MemEpollHandler {
|
|||||||
config.region_size,
|
config.region_size,
|
||||||
config.requested_size + VIRTIO_MEM_USABLE_EXTENT,
|
config.requested_size + VIRTIO_MEM_USABLE_EXTENT,
|
||||||
);
|
);
|
||||||
config.usable_region_size =
|
config.usable_region_size = cmp::max(config.usable_region_size, tmp_size);
|
||||||
cmp::max(config.usable_region_size, tmp_size);
|
|
||||||
if let Err(e) = self.signal(&VirtioInterruptType::Config) {
|
if let Err(e) = self.signal(&VirtioInterruptType::Config) {
|
||||||
signal_error = true;
|
signal_error = true;
|
||||||
|
error!("Error signalling config: {:?}", e);
|
||||||
Err(Error::ResizeTriggerFail(e))
|
Err(Error::ResizeTriggerFail(e))
|
||||||
} else {
|
} else {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if let Err(e) = &r {
|
|
||||||
// This error will send back to resize caller.
|
|
||||||
error!("Handle resize event get error: {:?}", e);
|
|
||||||
}
|
|
||||||
if let Err(e) = self.resize.send(r) {
|
if let Err(e) = self.resize.send(r) {
|
||||||
return Err(DeviceError::EpollHander(format!(
|
error!("Sending \"resize\" reponse: {:?}", e);
|
||||||
"Sending \"resize\" generated error: {:?}",
|
return true;
|
||||||
e
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
if signal_error {
|
if signal_error {
|
||||||
return Err(DeviceError::EpollHander(String::from(
|
return true;
|
||||||
"Signal get error",
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
QUEUE_AVAIL_EVENT => {
|
QUEUE_AVAIL_EVENT => {
|
||||||
if let Err(e) = self.queue_evt.read() {
|
if let Err(e) = self.queue_evt.read() {
|
||||||
return Err(DeviceError::EpollHander(format!(
|
error!("Failed to get queue event: {:?}", e);
|
||||||
"Failed to get queue event: {:?}",
|
return true;
|
||||||
e
|
|
||||||
)));
|
|
||||||
} else if self.process_queue() {
|
} else if self.process_queue() {
|
||||||
if let Err(e) = self.signal(&VirtioInterruptType::Queue) {
|
if let Err(e) = self.signal(&VirtioInterruptType::Queue) {
|
||||||
return Err(DeviceError::EpollHander(format!(
|
error!("Failed to signal used queue: {:?}", e);
|
||||||
"Failed to signal used queue: {:?}",
|
return true;
|
||||||
e
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
KILL_EVENT => {
|
|
||||||
debug!("kill_evt received, stopping epoll loop");
|
|
||||||
break 'epoll;
|
|
||||||
}
|
|
||||||
PAUSE_EVENT => {
|
|
||||||
debug!("PAUSE_EVENT received, pausing virtio-pmem epoll loop");
|
|
||||||
// We loop here to handle spurious park() returns.
|
|
||||||
// Until we have not resumed, the paused boolean will
|
|
||||||
// be true.
|
|
||||||
while paused.load(Ordering::SeqCst) {
|
|
||||||
thread::park();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Drain pause event after the device has been resumed.
|
|
||||||
// This ensures the pause event has been seen by each
|
|
||||||
// and every thread related to this virtio device.
|
|
||||||
let _ = self.pause_evt.read();
|
|
||||||
}
|
|
||||||
_ => {
|
_ => {
|
||||||
return Err(DeviceError::EpollHander(String::from(
|
error!("Unexpected event: {}", event);
|
||||||
"Unknown event for virtio-mem",
|
return true;
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
false
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -779,7 +684,7 @@ pub struct Mem {
|
|||||||
config: Arc<Mutex<VirtioMemConfig>>,
|
config: Arc<Mutex<VirtioMemConfig>>,
|
||||||
queue_evts: Option<Vec<EventFd>>,
|
queue_evts: Option<Vec<EventFd>>,
|
||||||
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
|
interrupt_cb: Option<Arc<dyn VirtioInterrupt>>,
|
||||||
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), DeviceError>>>>,
|
epoll_threads: Option<Vec<thread::JoinHandle<result::Result<(), EpollHelperError>>>>,
|
||||||
paused: Arc<AtomicBool>,
|
paused: Arc<AtomicBool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user