131 lines
5.1 KiB
Diff
131 lines
5.1 KiB
Diff
From 9e55bb375937f8cc93666d9998f09d23a31185f1 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Hasler <sebastian.hasler@stuvus.uni-stuttgart.de>
|
|
Date: Wed, 2 Feb 2022 17:50:34 +0100
|
|
Subject: [PATCH 1/3] process_queue_pool: Only acquire the VringMutex lock once
|
|
|
|
Previously, the worker task in `process_queue_pool()` called
|
|
up to 3 functions on `worker_vring` where each function is a
|
|
wrapper that first locks the mutex. This is unneccessary
|
|
congestion. We fix this by locking the mutex once.
|
|
|
|
Signed-off-by: Sebastian Hasler <sebastian.hasler@stuvus.uni-stuttgart.de>
|
|
(cherry picked from commit c904bd8dbd9557d1a59fa0934e092443c7264d43)
|
|
Signed-off-by: Sergio Lopez <slp@redhat.com>
|
|
---
|
|
src/main.rs | 72 +++++++++++++++++++----------------------------------
|
|
1 file changed, 26 insertions(+), 46 deletions(-)
|
|
|
|
diff --git a/src/main.rs b/src/main.rs
|
|
index 2049eda..5a9914f 100644
|
|
--- a/src/main.rs
|
|
+++ b/src/main.rs
|
|
@@ -9,7 +9,7 @@ use passthrough::xattrmap::XattrMap;
|
|
use std::convert::{self, TryFrom};
|
|
use std::ffi::CString;
|
|
use std::os::unix::io::{FromRawFd, RawFd};
|
|
-use std::sync::{Arc, Mutex, MutexGuard, RwLock};
|
|
+use std::sync::{Arc, Mutex, RwLock};
|
|
use std::{env, error, fmt, io, process};
|
|
|
|
use structopt::StructOpt;
|
|
@@ -128,6 +128,28 @@ impl<F: FileSystem + Send + Sync + 'static> VhostUserFsThread<F> {
|
|
})
|
|
}
|
|
|
|
+ fn return_descriptor(vring_state: &mut VringState, head_index: u16, event_idx: bool) {
|
|
+ if vring_state.add_used(head_index, 0).is_err() {
|
|
+ warn!("Couldn't return used descriptors to the ring");
|
|
+ }
|
|
+
|
|
+ if event_idx {
|
|
+ match vring_state.needs_notification() {
|
|
+ Err(_) => {
|
|
+ warn!("Couldn't check if queue needs to be notified");
|
|
+ vring_state.signal_used_queue().unwrap();
|
|
+ }
|
|
+ Ok(needs_notification) => {
|
|
+ if needs_notification {
|
|
+ vring_state.signal_used_queue().unwrap();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ } else {
|
|
+ vring_state.signal_used_queue().unwrap();
|
|
+ }
|
|
+ }
|
|
+
|
|
fn process_queue_pool(&mut self, vring: VringMutex) -> Result<bool> {
|
|
let mut used_any = false;
|
|
let atomic_mem = match &self.mem {
|
|
@@ -168,35 +190,14 @@ impl<F: FileSystem + Send + Sync + 'static> VhostUserFsThread<F> {
|
|
.map_err(Error::ProcessQueue)
|
|
.unwrap();
|
|
|
|
- if event_idx {
|
|
- if worker_vring.add_used(head_index, 0).is_err() {
|
|
- warn!("Couldn't return used descriptors to the ring");
|
|
- }
|
|
-
|
|
- match worker_vring.needs_notification() {
|
|
- Err(_) => {
|
|
- warn!("Couldn't check if queue needs to be notified");
|
|
- worker_vring.signal_used_queue().unwrap();
|
|
- }
|
|
- Ok(needs_notification) => {
|
|
- if needs_notification {
|
|
- worker_vring.signal_used_queue().unwrap();
|
|
- }
|
|
- }
|
|
- }
|
|
- } else {
|
|
- if worker_vring.add_used(head_index, 0).is_err() {
|
|
- warn!("Couldn't return used descriptors to the ring");
|
|
- }
|
|
- worker_vring.signal_used_queue().unwrap();
|
|
- }
|
|
+ Self::return_descriptor(&mut worker_vring.get_mut(), head_index, event_idx);
|
|
});
|
|
}
|
|
|
|
Ok(used_any)
|
|
}
|
|
|
|
- fn process_queue_serial(&mut self, vring_state: &mut MutexGuard<VringState>) -> Result<bool> {
|
|
+ fn process_queue_serial(&mut self, vring_state: &mut VringState) -> Result<bool> {
|
|
let mut used_any = false;
|
|
let mem = match &self.mem {
|
|
Some(m) => m.memory(),
|
|
@@ -226,28 +227,7 @@ impl<F: FileSystem + Send + Sync + 'static> VhostUserFsThread<F> {
|
|
.map_err(Error::ProcessQueue)
|
|
.unwrap();
|
|
|
|
- if self.event_idx {
|
|
- if vring_state.add_used(head_index, 0).is_err() {
|
|
- warn!("Couldn't return used descriptors to the ring");
|
|
- }
|
|
-
|
|
- match vring_state.needs_notification() {
|
|
- Err(_) => {
|
|
- warn!("Couldn't check if queue needs to be notified");
|
|
- vring_state.signal_used_queue().unwrap();
|
|
- }
|
|
- Ok(needs_notification) => {
|
|
- if needs_notification {
|
|
- vring_state.signal_used_queue().unwrap();
|
|
- }
|
|
- }
|
|
- }
|
|
- } else {
|
|
- if vring_state.add_used(head_index, 0).is_err() {
|
|
- warn!("Couldn't return used descriptors to the ring");
|
|
- }
|
|
- vring_state.signal_used_queue().unwrap();
|
|
- }
|
|
+ Self::return_descriptor(vring_state, head_index, self.event_idx);
|
|
}
|
|
|
|
Ok(used_any)
|
|
--
|
|
2.35.1
|
|
|