From 32d07e40cc5f4338c1ae878ecaf72687157b6d9a Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Fri, 4 Oct 2019 12:01:32 -0700
Subject: [PATCH] vmm: Add iommu=on|off option for --console

Having the virtual IOMMU created with --iommu is one thing, but we also
need a way to decide if a virtio-console device should be attached to
this virtual IOMMU or not. That's why we introduce an extra option
"iommu" with the value "on" or "off". By default, the device is not
attached, which means "iommu=off".

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 src/main.rs                               |  5 +-
 vmm/src/api/openapi/cloud-hypervisor.yaml |  3 +
 vmm/src/config.rs                         | 70 +++++++++++++++--------
 3 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index e26e766a8..e8576fcc9 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -187,7 +187,10 @@ fn main() {
         .arg(
             Arg::with_name("console")
                 .long("console")
-                .help("Control (virtio) console: off|null|tty|file=/path/to/a/file")
+                .help(
+                    "Control (virtio) console: \"off|null|tty|file=/path/to/a/file,\
+                     iommu=on|off\"",
+                )
                 .default_value("tty")
                 .group("vm-config"),
         )
diff --git a/vmm/src/api/openapi/cloud-hypervisor.yaml b/vmm/src/api/openapi/cloud-hypervisor.yaml
index f29b4781e..fde659f8f 100644
--- a/vmm/src/api/openapi/cloud-hypervisor.yaml
+++ b/vmm/src/api/openapi/cloud-hypervisor.yaml
@@ -303,6 +303,9 @@ components:
         mode:
           type: string
           enum: [Off, Tty, File, Null]
+        iommu:
+          type: boolean
+          default: false
 
     DeviceConfig:
       required:
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 2fca21c72..6ac94c444 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -504,39 +504,59 @@ impl ConsoleOutputMode {
 pub struct ConsoleConfig {
     pub file: Option<PathBuf>,
     pub mode: ConsoleOutputMode,
+    #[serde(default)]
+    pub iommu: bool,
 }
 
 impl ConsoleConfig {
-    pub fn parse(param: &str) -> Result<Self> {
-        if param == "off" {
-            Ok(Self {
-                mode: ConsoleOutputMode::Off,
-                file: None,
-            })
-        } else if param == "tty" {
-            Ok(Self {
-                mode: ConsoleOutputMode::Tty,
-                file: None,
-            })
-        } else if param.starts_with("file=") {
-            Ok(Self {
-                mode: ConsoleOutputMode::File,
-                file: Some(PathBuf::from(&param[5..])),
-            })
-        } else if param.starts_with("null") {
-            Ok(Self {
-                mode: ConsoleOutputMode::Null,
-                file: None,
-            })
-        } else {
-            Err(Error::ParseConsoleParam)
+    pub fn parse(console: &str) -> Result<Self> {
+        // Split the parameters based on the comma delimiter
+        let params_list: Vec<&str> = console.split(',').collect();
+
+        let mut valid = false;
+        let mut file: Option<PathBuf> = None;
+        let mut mode: ConsoleOutputMode = ConsoleOutputMode::Off;
+        let mut iommu_str: &str = "";
+
+        for param in params_list.iter() {
+            if param.starts_with("iommu=") {
+                iommu_str = &param[6..];
+            } else {
+                if *param == "off" {
+                    mode = ConsoleOutputMode::Off;
+                    file = None;
+                } else if *param == "tty" {
+                    mode = ConsoleOutputMode::Tty;
+                    file = None;
+                } else if param.starts_with("file=") {
+                    mode = ConsoleOutputMode::File;
+                    file = Some(PathBuf::from(&param[5..]));
+                } else if param.starts_with("null") {
+                    mode = ConsoleOutputMode::Null;
+                    file = None;
+                } else {
+                    return Err(Error::ParseConsoleParam);
+                }
+                valid = true;
+            }
         }
+
+        if !valid {
+            return Err(Error::ParseConsoleParam);
+        }
+
+        Ok(Self {
+            mode,
+            file,
+            iommu: parse_iommu(iommu_str)?,
+        })
     }
 
     pub fn default_serial() -> Self {
         ConsoleConfig {
             file: None,
             mode: ConsoleOutputMode::Null,
+            iommu: false,
         }
     }
 
@@ -544,6 +564,7 @@ impl ConsoleConfig {
         ConsoleConfig {
             file: None,
             mode: ConsoleOutputMode::Tty,
+            iommu: false,
         }
     }
 }
@@ -804,6 +825,9 @@ impl VmConfig {
         }
 
         let console = ConsoleConfig::parse(vm_params.console)?;
+        if console.iommu {
+            iommu = true;
+        }
         let serial = ConsoleConfig::parse(vm_params.serial)?;
         if console.mode == ConsoleOutputMode::Tty && serial.mode == ConsoleOutputMode::Tty {
             return Err(Error::ParseTTYParam);