Impove memory management

src/main.rs

@@ -25,6 +25,10 @@ struct VMMOpts {
     /// Stdout console file path
     #[clap(long)]
     console: Option<String>,
+
+    /// Interface name
+    #[clap(long)]
+    net: Option<String>,
 }
 
 #[derive(Debug)]
@@ -47,7 +51,7 @@ fn main() -> Result<(), Error> {
     // * Memory size (in MB)
     // * Path to a Linux kernel
     // * Optional path to console file
-    vmm.configure(opts.cpus, opts.memory, &opts.kernel, opts.console)
+    vmm.configure(opts.cpus, opts.memory, &opts.kernel, opts.console, opts.net)
         .map_err(Error::VmmConfigure)?;
 
     // Run the VMM

src/vmm/Cargo.toml

@@ -11,10 +11,14 @@ libc = "0.2.91"
 linux-loader = { version = "0.8.1", features = ["bzimage", "elf"] }
 vm-memory = { version = "0.10.0", features = ["backend-mmap"] }
 vmm-sys-util = "0.11.1"
+virtio-bindings = "0.2.0"
 
 # vm-device is not yet published on crates.io.
 # To make sure that breaking changes to vm-device are not breaking the
 # vm-vcpu build, we're using a fixed revision.
-vm-device = { git = "https://github.com/rust-vmm/vm-device", rev = "5847f12" }
+vm-device = { git = "https://github.com/lucido-simon/vm-device", rev = "63bf6ecea4ee851d500e283dc3809baf6f89555d" }
+vm-allocator = { git = "https://github.com/lucido-simon/vm-allocator", rev = "dfb880a86763a0064fdd700fbe731f26fcbf6681"}
+virtio-device = { git = "https://github.com/rust-vmm/vm-virtio" }
+virtio-queue = { git = "https://github.com/rust-vmm/vm-virtio" }
 
 vm-superio = "0.7.0"

src/vmm/src/cpu/mod.rs

@@ -8,6 +8,7 @@ use std::{result, u64};
 
 use kvm_bindings::{kvm_fpu, kvm_regs, CpuId};
 use kvm_ioctls::{VcpuExit, VcpuFd, VmFd};
+use vm_device::device_manager::{IoManager, MmioManager};
 use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryError, GuestMemoryMmap};
 use vmm_sys_util::terminal::Terminal;
 
@@ -66,15 +67,22 @@ pub(crate) struct Vcpu {
     pub vcpu_fd: VcpuFd,
 
     serial: Arc<Mutex<LumperSerial>>,
+    virtio_manager: Arc<Mutex<IoManager>>,
 }
 
 impl Vcpu {
     /// Create a new vCPU.
-    pub fn new(vm_fd: &VmFd, index: u64, serial: Arc<Mutex<LumperSerial>>) -> Result<Self> {
+    pub fn new(
+        vm_fd: &VmFd,
+        index: u64,
+        serial: Arc<Mutex<LumperSerial>>,
+        virtio_manager: Arc<Mutex<IoManager>>,
+    ) -> Result<Self> {
         Ok(Vcpu {
             index,
             vcpu_fd: vm_fd.create_vcpu(index).map_err(Error::KvmIoctl)?,
             serial,
+            virtio_manager,
         })
     }
 
@@ -266,10 +274,36 @@ impl Vcpu {
                         println!("Unsupported device read at {:x?}", addr);
                     }
                 },
+
+                // This is a MMIO write, i.e. the guest is trying to write
+                // something to a memory-mapped I/O region.
+                VcpuExit::MmioWrite(addr, data) => {
+                    self.virtio_manager
+                        .lock()
+                        .unwrap()
+                        .mmio_write(GuestAddress(addr), data)
+                        .unwrap_or_else(|e| {
+                            eprintln!("Failed to write to MMIO at addrress {:#x}: {}", addr, e);
+                        });
+                }
+
+                // This is a MMIO read, i.e. the guest is trying to read
+                // from a memory-mapped I/O region.
+                VcpuExit::MmioRead(addr, data) => {
+                    self.virtio_manager
+                        .lock()
+                        .unwrap()
+                        .mmio_read(GuestAddress(addr), data)
+                        .unwrap_or_else(|e| {
+                            eprintln!("Failed to read to MMIO at addrress {:#x}: {}", addr, e);
+                        });
+                }
+
                 _ => {
                     eprintln!("Unhandled VM-Exit: {:?}", exit_reason);
                 }
             },
+
             Err(e) => eprintln!("Emulation error: {}", e),
         }
     }

src/vmm/src/devices/mod.rs

@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
+pub(crate) mod net;
 pub(crate) mod serial;