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

vm-virtio, vhost_user_{fs,block,backend}: Move EVENT_IDX handling

Browse Source 
Move the method that is used to decide whether the guest should be
signalled into the Queue implementation from vm-virtio. This removes
duplicated code between vhost_user_backend and the vm-virtio block
implementation.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-05-20 10:40:54 +01:00
committed by Sebastien Boeuf
parent 8ae7a38da5
commit a813b57f59
5 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vm-virtio/src/block.rs
View File

@@ -23,7 +23,6 @@ use std::cmp;
use std::convert::TryInto;
use std::fs::{File, Metadata};
use std::io::{self, Read, Seek, SeekFrom, Write};
use std::num::Wrapping;
use std::ops::DerefMut;
use std::os::linux::fs::MetadataExt;
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
@@ -607,7 +606,6 @@ struct BlockEpollHandler<T: DiskFile> {
kill_evt: EventFd,
pause_evt: EventFd,
event_idx: bool,
signalled_used: Option<Wrapping<u16>>,
}
impl<T: DiskFile> BlockEpollHandler<T> {
@@ -682,25 +680,6 @@ impl<T: DiskFile> BlockEpollHandler<T> {
Ok(())
}
fn needs_notification(&mut self, mem: &GuestMemoryMmap, used_idx: Wrapping<u16>) -> bool {
if !self.event_idx {
return true;
}
let mut notify = true;
if let Some(old_idx) = self.signalled_used {
if let Some(used_event) = self.queue.get_used_event(&mem) {
if (used_idx - used_event - Wrapping(1u16)) >= (used_idx - old_idx) {
notify = false;
}
}
}
self.signalled_used = Some(used_idx);
notify
}
fn run(
&mut self,
queue_evt: EventFd,
@@ -772,7 +751,7 @@ impl<T: DiskFile> BlockEpollHandler<T> {
if self.process_queue() {
self.queue.update_avail_event(&self.mem.memory());
if self.needs_notification(
if self.queue.needs_notification(
&self.mem.memory(),
self.queue.next_used,
) {
@@ -1176,9 +1155,10 @@ impl<T: 'static + DiskFile + Send> VirtioDevice for Block<T> {
kill_evt: kill_evt.try_clone().unwrap(),
pause_evt: pause_evt.try_clone().unwrap(),
event_idx,
signalled_used: None,
};
handler.queue.set_event_idx(event_idx);
let queue_evt = queue_evts.remove(0);
let paused = self.paused.clone();
thread::Builder::new()