From 404316eea184abbc4796592d28e4ead8140c529c Mon Sep 17 00:00:00 2001
From: Cathy Zhang <cathy.zhang@intel.com>
Date: Tue, 12 Nov 2019 17:14:54 +0800
Subject: [PATCH] vmm: Add multiple queue option and update config for
 virtio-net device

Add num_queues and queue_size for virtio-net device to make them configurable,
while add the associated options in command line.

Update cloud-hypervisor.yaml with the new options for NetConfig.

Signed-off-by: Cathy Zhang <cathy.zhang@intel.com>
---
 src/main.rs                               |  3 +-
 vmm/src/api/openapi/cloud-hypervisor.yaml |  6 ++++
 vmm/src/config.rs                         | 36 +++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 73a52eee9..cb32d3939 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -131,7 +131,8 @@ fn create_app<'a, 'b>(
                 .help(
                     "Network parameters \"tap=<if_name>,\
                      ip=<ip_addr>,mask=<net_mask>,mac=<mac_addr>,\
-                     iommu=on|off\"",
+                     iommu=on|off,num_queues=<number_of_queues>,\
+                     queue_size=<size_of_each_queue>\"",
                 )
                 .takes_value(true)
                 .min_values(1)
diff --git a/vmm/src/api/openapi/cloud-hypervisor.yaml b/vmm/src/api/openapi/cloud-hypervisor.yaml
index f88416dcc..686f82bb1 100644
--- a/vmm/src/api/openapi/cloud-hypervisor.yaml
+++ b/vmm/src/api/openapi/cloud-hypervisor.yaml
@@ -295,6 +295,12 @@ components:
         iommu:
           type: boolean
           default: false
+        num_queues:
+          type: integer
+          default: 2
+        queue_size:
+          type: integer
+          default: 256
 
     RngConfig:
       required:
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index cf3f4f08b..4139ca5cd 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -46,6 +46,10 @@ pub enum Error<'a> {
     ParseNetMaskParam(AddrParseError),
     /// Failed parsing network mac parameter.
     ParseNetMacParam(&'a str),
+    /// Failed parsing network queue number parameter.
+    ParseNetNumQueuesParam(std::num::ParseIntError),
+    /// Failed parsing network queue size parameter.
+    ParseNetQueueSizeParam(std::num::ParseIntError),
     /// Failed parsing fs tag parameter.
     ParseFsTagParam,
     /// Failed parsing fs socket path parameter.
@@ -372,6 +376,10 @@ pub struct NetConfig {
     pub mac: MacAddr,
     #[serde(default)]
     pub iommu: bool,
+    #[serde(default = "default_netconfig_num_queues")]
+    pub num_queues: usize,
+    #[serde(default = "default_netconfig_queue_size")]
+    pub queue_size: u16,
 }
 
 fn default_netconfig_tap() -> Option<String> {
@@ -390,6 +398,14 @@ fn default_netconfig_mac() -> MacAddr {
     MacAddr::local_random()
 }
 
+fn default_netconfig_num_queues() -> usize {
+    DEFAULT_NUM_QUEUES_VUNET
+}
+
+fn default_netconfig_queue_size() -> u16 {
+    DEFAULT_QUEUE_SIZE_VUNET
+}
+
 impl NetConfig {
     pub fn parse(net: &str) -> Result<Self> {
         // Split the parameters based on the comma delimiter
@@ -400,6 +416,8 @@ impl NetConfig {
         let mut mask_str: &str = "";
         let mut mac_str: &str = "";
         let mut iommu_str: &str = "";
+        let mut num_queues_str: &str = "";
+        let mut queue_size_str: &str = "";
 
         for param in params_list.iter() {
             if param.starts_with("tap=") {
@@ -412,6 +430,10 @@ impl NetConfig {
                 mac_str = &param[4..];
             } else if param.starts_with("iommu=") {
                 iommu_str = &param[6..];
+            } else if param.starts_with("num_queues=") {
+                num_queues_str = &param[11..];
+            } else if param.starts_with("queue_size=") {
+                queue_size_str = &param[11..];
             }
         }
 
@@ -420,6 +442,8 @@ impl NetConfig {
         let mut mask: Ipv4Addr = default_netconfig_mask();
         let mut mac: MacAddr = default_netconfig_mac();
         let iommu = parse_on_off(iommu_str)?;
+        let mut num_queues: usize = default_netconfig_num_queues();
+        let mut queue_size: u16 = default_netconfig_queue_size();
 
         if !tap_str.is_empty() {
             tap = Some(tap_str.to_string());
@@ -433,6 +457,16 @@ impl NetConfig {
         if !mac_str.is_empty() {
             mac = MacAddr::parse_str(mac_str).map_err(Error::ParseNetMacParam)?;
         }
+        if !num_queues_str.is_empty() {
+            num_queues = num_queues_str
+                .parse()
+                .map_err(Error::ParseNetNumQueuesParam)?;
+        }
+        if !queue_size_str.is_empty() {
+            queue_size = queue_size_str
+                .parse()
+                .map_err(Error::ParseNetQueueSizeParam)?;
+        }
 
         Ok(NetConfig {
             tap,
@@ -440,6 +474,8 @@ impl NetConfig {
             mask,
             mac,
             iommu,
+            num_queues,
+            queue_size,
         })
     }
 }