From 99da1dff90706de0d9b9372deb46ed87ffa76bcc Mon Sep 17 00:00:00 2001
From: Yang Zhong <yang.zhong@intel.com>
Date: Mon, 3 Feb 2020 15:36:15 +0800
Subject: [PATCH] vhost-user-blk: Add MQ support in backend

Adding the num_queues parameter for vhost-user-blk backend, which
can enable MQ support in the backend.

This patch has enabled the MQ support from handle_event, and the
vhost-user-backend crate will enable multiple threads to call this
handle_event to handle read/write operations.

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
 src/bin/vhost_user_blk.rs   |  4 ++--
 vhost_user_block/src/lib.rs | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/bin/vhost_user_blk.rs b/src/bin/vhost_user_blk.rs
index 39a7dd5f4..fd7f7d6dc 100644
--- a/src/bin/vhost_user_blk.rs
+++ b/src/bin/vhost_user_blk.rs
@@ -25,8 +25,8 @@ fn main() {
                 .long("block-backend")
                 .help(
                     "vhost-user-block backend parameters \"image=<image_path>,\
-                     sock=<socket_path>,readonly=true|false,\
-                     direct=true|false\"",
+                     sock=<socket_path>,num_queues=<number_of_queues>,\
+                     readonly=true|false,direct=true|false\"",
                 )
                 .takes_value(true)
                 .min_values(1),
diff --git a/vhost_user_block/src/lib.rs b/vhost_user_block/src/lib.rs
index 542e304b2..e8b792fb8 100644
--- a/vhost_user_block/src/lib.rs
+++ b/vhost_user_block/src/lib.rs
@@ -34,7 +34,6 @@ use vm_memory::{Bytes, GuestMemoryError, GuestMemoryMmap};
 use vm_virtio::block::{build_disk_image_id, Request};
 
 const QUEUE_SIZE: usize = 1024;
-const NUM_QUEUES: usize = 1;
 const SECTOR_SHIFT: u8 = 9;
 const SECTOR_SIZE: u64 = (0x01 as u64) << SECTOR_SHIFT;
 const BLK_SIZE: u32 = 512;
@@ -61,6 +60,8 @@ pub enum Error {
     ParseSockParam,
     /// Failed to parse readonly parameter.
     ParseReadOnlyParam,
+    /// Failed parsing fs number of queues parameter.
+    ParseBlkNumQueuesParam(std::num::ParseIntError),
 }
 
 pub struct VhostUserBlkBackend {
@@ -74,7 +75,7 @@ pub struct VhostUserBlkBackend {
 }
 
 impl VhostUserBlkBackend {
-    pub fn new(image_path: String, rdonly: bool, direct: bool) -> Result<Self> {
+    pub fn new(image_path: String, num_queues: usize, rdonly: bool, direct: bool) -> Result<Self> {
         let mut options = OpenOptions::new();
         options.read(true);
         options.write(!rdonly);
@@ -100,7 +101,7 @@ impl VhostUserBlkBackend {
         config.seg_max = 128 - 2;
         config.min_io_size = 1;
         config.opt_io_size = 1;
-        config.num_queues = 1;
+        config.num_queues = num_queues as u16;
         config.wce = 1;
 
         Ok(VhostUserBlkBackend {
@@ -163,7 +164,7 @@ impl VhostUserBlkBackend {
 
 impl VhostUserBackend for VhostUserBlkBackend {
     fn num_queues(&self) -> usize {
-        NUM_QUEUES
+        self.config.num_queues as usize
     }
 
     fn max_queue_size(&self) -> usize {
@@ -204,7 +205,7 @@ impl VhostUserBackend for VhostUserBlkBackend {
 
         debug!("event received: {:?}", device_event);
 
-        let mut vring = vrings[0].write().unwrap();
+        let mut vring = vrings[device_event as usize].write().unwrap();
         if self.process_queue(&mut vring) {
             debug!("signalling queue");
             vring.signal_used_queue().unwrap();
@@ -229,6 +230,7 @@ impl VhostUserBackend for VhostUserBlkBackend {
 pub struct VhostUserBlkBackendConfig<'a> {
     pub image: &'a str,
     pub sock: &'a str,
+    pub num_queues: usize,
     pub readonly: bool,
     pub direct: bool,
 }
@@ -239,6 +241,7 @@ impl<'a> VhostUserBlkBackendConfig<'a> {
 
         let mut image: &str = "";
         let mut sock: &str = "";
+        let mut num_queues_str: &str = "";
         let mut readonly: bool = false;
         let mut direct: bool = false;
 
@@ -247,6 +250,8 @@ impl<'a> VhostUserBlkBackendConfig<'a> {
                 image = &param[6..];
             } else if param.starts_with("sock=") {
                 sock = &param[5..];
+            } else if param.starts_with("num_queues=") {
+                num_queues_str = &param[11..];
             } else if param.starts_with("readonly=") {
                 readonly = match param[9..].parse::<bool>() {
                     Ok(b) => b,
@@ -260,16 +265,22 @@ impl<'a> VhostUserBlkBackendConfig<'a> {
             }
         }
 
+        let mut num_queues: usize = 1;
         if image.is_empty() {
             return Err(Error::ParseImageParam);
         }
         if sock.is_empty() {
             return Err(Error::ParseSockParam);
         }
-
+        if !num_queues_str.is_empty() {
+            num_queues = num_queues_str
+                .parse()
+                .map_err(Error::ParseBlkNumQueuesParam)?;
+        }
         Ok(VhostUserBlkBackendConfig {
             image,
             sock,
+            num_queues,
             readonly,
             direct,
         })
@@ -288,6 +299,7 @@ pub fn start_block_backend(backend_command: &str) {
     let blk_backend = Arc::new(RwLock::new(
         VhostUserBlkBackend::new(
             backend_config.image.to_string(),
+            backend_config.num_queues,
             backend_config.readonly,
             backend_config.direct,
         )