[2/4] Change network config representation in ContextConfig

This enables implementing krun_set_passt_fd, but note that the actual virtio-net device
using passt will be implemented in the next commits.

Signed-off-by: Matej Hrica <[email protected]>

Author: mtjhrc

Cargo.lock

@@ -8,6 +8,7 @@ use std::env;
 use std::ffi::CStr;
 #[cfg(target_os = "linux")]
 use std::ffi::CString;
+use std::os::fd::RawFd;
 #[cfg(not(feature = "tee"))]
 use std::path::Path;
 #[cfg(feature = "tee")]
@@ -44,6 +45,27 @@ const MAX_ARGS: usize = 4096;
 // Path to the init binary to be executed inside the VM.
 const INIT_PATH: &str = "/init.krun";
 
+#[derive(Default)]
+struct TsiConfig {
+    port_map: Option<HashMap<u16, u16>>,
+}
+
+struct PasstConfig {
+    fd: RawFd,
+}
+
+enum NetworkConfig {
+    Tsi(TsiConfig),
+    Passt(PasstConfig),
+}
+
+impl Default for NetworkConfig {
+    /// Default network mode is TSI, for backwards compatibility
+    fn default() -> Self {
+        NetworkConfig::Tsi(Default::default())
+    }
+}
+
 #[derive(Default)]
 struct ContextConfig {
     vmr: VmResources,
@@ -52,13 +74,13 @@ struct ContextConfig {
     env: Option<String>,
     args: Option<String>,
     rlimits: Option<String>,
+    net_cfg: NetworkConfig,
     #[cfg(not(feature = "tee"))]
     fs_cfg: Option<FsDeviceConfig>,
     #[cfg(feature = "tee")]
     root_block_cfg: Option<BlockDeviceConfig>,
     #[cfg(feature = "tee")]
     data_block_cfg: Option<BlockDeviceConfig>,
-    port_map: Option<HashMap<u16, u16>>,
     #[cfg(feature = "tee")]
     tee_config_file: Option<PathBuf>,
 }
@@ -149,12 +171,18 @@ impl ContextConfig {
         self.data_block_cfg.clone()
     }
 
-    fn set_port_map(&mut self, port_map: HashMap<u16, u16>) {
-        self.port_map = Some(port_map);
+    fn set_net_cfg(&mut self, net_cfg: NetworkConfig) {
+        self.net_cfg = net_cfg;
     }
 
-    fn get_port_map(&self) -> Option<HashMap<u16, u16>> {
-        self.port_map.clone()
+    fn set_port_map(&mut self, new_port_map: HashMap<u16, u16>) -> Result<(), ()> {
+        match &mut self.net_cfg {
+            NetworkConfig::Tsi(tsi_config) => {
+                tsi_config.port_map.replace(new_port_map);
+                Ok(())
+            }
+            NetworkConfig::Passt(_) => Err(()),
+        }
     }
 
     #[cfg(feature = "tee")]
@@ -461,7 +489,19 @@ pub unsafe extern "C" fn krun_set_data_disk(ctx_id: u32, c_disk_path: *const c_c
 #[allow(clippy::missing_safety_doc)]
 #[no_mangle]
 pub unsafe extern "C" fn krun_set_passt_fd(ctx_id: u32, fd: c_int) -> i32 {
-    todo!("krun_set_passt_fd({},{})", ctx_id, fd);
+    if fd < 0 {
+        return -libc::EINVAL;
+    }
+
+    match CTX_MAP.lock().unwrap().entry(ctx_id) {
+        Entry::Occupied(mut ctx_cfg) => {
+            let cfg = ctx_cfg.get_mut();
+            cfg.set_net_cfg(NetworkConfig::Passt(PasstConfig { fd }));
+        }
+        Entry::Vacant(_) => return -libc::ENOENT,
+    }
+
+    KRUN_SUCCESS
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -505,7 +545,9 @@ pub unsafe extern "C" fn krun_set_port_map(ctx_id: u32, c_port_map: *const *cons
     match CTX_MAP.lock().unwrap().entry(ctx_id) {
         Entry::Occupied(mut ctx_cfg) => {
             let cfg = ctx_cfg.get_mut();
-            cfg.set_port_map(port_map);
+            if cfg.set_port_map(port_map).is_err() {
+                return -libc::ENOTSUP;
+            }
         }
         Entry::Vacant(_) => return -libc::ENOENT,
     }
@@ -768,12 +810,19 @@ pub extern "C" fn krun_start_enter(ctx_id: u32) -> i32 {
         return -libc::EINVAL;
     }
 
-    let vsock_device_config = VsockDeviceConfig {
-        vsock_id: "vsock0".to_string(),
-        guest_cid: 3,
-        host_port_map: ctx_cfg.get_port_map(),
-    };
-    ctx_cfg.vmr.set_vsock_device(vsock_device_config).unwrap();
+    match ctx_cfg.net_cfg {
+        NetworkConfig::Tsi(tsi_cfg) => {
+            let vsock_device_config = VsockDeviceConfig {
+                vsock_id: "vsock0".to_string(),
+                guest_cid: 3,
+                host_port_map: tsi_cfg.port_map,
+            };
+            ctx_cfg.vmr.set_vsock_device(vsock_device_config).unwrap();
+        }
+        NetworkConfig::Passt(passt_cfg) => {
+            todo!("Connect to fd {} and implement networking", passt_cfg.fd)
+        }
+    }
 
     let _vmm = match vmm::builder::build_microvm(&ctx_cfg.vmr, &mut event_manager) {
         Ok(vmm) => vmm,