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

vhost_user_backend: call get_used_event from needs_notification

Browse Source 
This change, combined with the compiler hint to inline get_used_event,
shortens the window between the memory read and the actual check by
calling get_used_event from needs_notification.

Without it, when putting enough pressure on the vring, it's possible
that a notification is wrongly omitted, causing the queue to stall.

Signed-off-by: Sergio Lopez <slp@redhat.com>
This commit is contained in:
Sergio Lopez 2020-03-10 05:43:13 -04:00 committed by Rob Bradford
parent 536323d9fb
commit 3957d1ee27
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/vhost_user_fs.rs
View File

@ -126,8 +126,7 @@ impl<F: FileSystem + Send + Sync + 'static> VhostUserFsBackend<F> {
.map_err(Error::ProcessQueue)?;
if self.event_idx {
if let Some(used_idx) = vring.mut_queue().add_used(mem, head_index, 0) {
let used_event = vring.mut_queue().get_used_event(mem);
if vring.needs_notification(Wrapping(used_idx), used_event) {
if vring.needs_notification(&mem, Wrapping(used_idx)) {
vring.signal_used_queue().map_err(Error::SignalQueue)?;
}
used_any = true;

8
vhost_user_backend/src/lib.rs
View File

@ -235,11 +235,7 @@ impl Vring {
self.event_idx = enabled;
}
pub fn needs_notification(
&mut self,
used_idx: Wrapping<u16>,
used_event: Option<Wrapping<u16>>,
) -> bool {
pub fn needs_notification(&mut self, mem: &GuestMemoryMmap, used_idx: Wrapping<u16>) -> bool {
if !self.event_idx {
return true;
}
@ -247,7 +243,7 @@ impl Vring {
let mut notify = true;
if let Some(old_idx) = self.signalled_used {
if let Some(used_event) = used_event {
if let Some(used_event) = self.mut_queue().get_used_event(&mem) {
if (used_idx - used_event - Wrapping(1u16)) >= (used_idx - old_idx) {
notify = false;
}

3
vhost_user_block/src/lib.rs
View File

@ -197,8 +197,7 @@ impl VhostUserBlkBackend {
if self.event_idx {
if let Some(used_idx) = vring.mut_queue().add_used(mem, head.index, len) {
let used_event = vring.mut_queue().get_used_event(mem);
if vring.needs_notification(Wrapping(used_idx), used_event) {
if vring.needs_notification(&mem, Wrapping(used_idx)) {
debug!("signalling queue");
vring.signal_used_queue().unwrap();
} else {