libkrun: Produce a proper Rust library

src/arch/Cargo.toml

@@ -12,7 +12,7 @@ efi = []
 
 [dependencies]
 libc = ">=0.2.39"
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }
 vmm-sys-util = ">= 0.14"
 
 arch_gen = { path = "../arch_gen" }

src/arch/src/x86_64/mptable.rs

@@ -12,7 +12,7 @@ use std::slice;
 use libc::c_char;
 
 use arch_gen::x86::mpspec;
-use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap};
+use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryMmap};
 
 // This is a workaround to the Rust enforcement specifying that any implementation of a foreign
 // trait (in this case `ByteValued`) where:

src/arch/src/x86_64/regs.rs

@@ -10,7 +10,7 @@ use std::mem;
 use super::gdt::{gdt_entry, kvm_segment_from_gdt};
 use kvm_bindings::{kvm_fpu, kvm_regs, kvm_sregs};
 use kvm_ioctls::VcpuFd;
-use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap};
+use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryMmap};
 
 // Initial pagetables.
 const PML4_START: u64 = 0x9000;

src/devices/Cargo.toml

@@ -30,7 +30,7 @@ pw = { package = "pipewire", version = "0.8.0", optional = true }
 rand = "0.9.2"
 thiserror = { version = "2.0", optional = true }
 virtio-bindings = "0.2.0"
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }
 zerocopy = { version = "0.8.26", optional = true, features = ["derive"] }
 krun_display = { path = "../krun_display", optional = true, features = ["bindgen_clang_runtime"] }
 krun_input = { path = "../krun_input", features = ["bindgen_clang_runtime"], optional = true }

src/devices/src/virtio/balloon/device.rs

@@ -3,7 +3,7 @@ use std::convert::TryInto;
 use std::io::Write;
 
 use utils::eventfd::EventFd;
-use vm_memory::{ByteValued, GuestMemory, GuestMemoryMmap};
+use vm_memory::{ByteValued, GuestMemoryBackend, GuestMemoryMmap};
 
 use super::super::{
     ActivateError, ActivateResult, BalloonError, DeviceQueue, DeviceState, QueueConfig,

src/devices/src/virtio/console/process_rx.rs

@@ -2,7 +2,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 use std::{io, thread};
 
-use vm_memory::{GuestMemory, GuestMemoryError, GuestMemoryMmap, GuestMemoryRegion};
+use vm_memory::{GuestMemoryBackend, GuestMemoryError, GuestMemoryMmap};
 
 use crate::virtio::console::console_control::ConsoleControl;
 use crate::virtio::console::port_io::PortInput;
@@ -89,19 +89,18 @@ fn read_to_desc(
     input: &mut (dyn PortInput + Send),
     eof: &mut bool,
 ) -> Result<usize, GuestMemoryError> {
-    desc.mem
-        .try_access(desc.len as usize, desc.addr, |_, len, addr, region| {
-            let mut target = region.get_slice(addr, len).unwrap();
-            match input.read_volatile(&mut target) {
-                Ok(n) => {
-                    if n == 0 {
-                        *eof = true
-                    }
-                    Ok(n)
-                }
-                // We can't return an error otherwise we would not know how many bytes were processed before WouldBlock
-                Err(e) if e.kind() == io::ErrorKind::WouldBlock => Ok(0),
-                Err(e) => Err(GuestMemoryError::IOError(e)),
+    let mut total = 0;
+    for slice in desc.mem.get_slices(desc.addr, desc.len as usize) {
+        let mut slice = slice?;
+        match input.read_volatile(&mut slice) {
+            Ok(0) => {
+                *eof = true;
+                break;
             }
-        })
+            Ok(n) => total += n,
+            Err(e) if e.kind() == io::ErrorKind::WouldBlock => break,
+            Err(e) => return Err(GuestMemoryError::IOError(e)),
+        }
+    }
+    Ok(total)
 }

src/devices/src/virtio/console/process_tx.rs

@@ -2,7 +2,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 use std::{io, thread};
 
-use vm_memory::{GuestMemory, GuestMemoryError, GuestMemoryMmap, GuestMemoryRegion};
+use vm_memory::{GuestMemoryBackend, GuestMemoryError, GuestMemoryMmap};
 
 use crate::virtio::console::port_io::PortOutput;
 use crate::virtio::{DescriptorChain, InterruptTransport, Queue};
@@ -76,22 +76,24 @@ fn write_desc_to_output(
     output: &mut (dyn PortOutput + Send),
     interrupt: &InterruptTransport,
 ) -> Result<usize, GuestMemoryError> {
-    desc.mem
-        .try_access(desc.len as usize, desc.addr, |_, len, addr, region| {
-            let src = region.get_slice(addr, len).unwrap();
-            loop {
-                log::trace!("Tx {src:?}, write_volatile {len} bytes");
-                match output.write_volatile(&src) {
-                    // try_access seem to handle partial write for us (we will be invoked again with an offset)
-                    Ok(n) => break Ok(n),
-                    // We can't return an error otherwise we would not know how many bytes were processed before WouldBlock
-                    Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
-                        log::trace!("Tx wait for output (would block)");
-                        interrupt.signal_used_queue();
-                        output.wait_until_writable();
-                    }
-                    Err(e) => break Err(GuestMemoryError::IOError(e)),
+    let mut total = 0;
+    for slice in desc.mem.get_slices(desc.addr, desc.len as usize) {
+        let slice = slice?;
+        loop {
+            log::trace!("Tx {slice:?}, write_volatile {} bytes", slice.len());
+            match output.write_volatile(&slice) {
+                Ok(n) => {
+                    total += n;
+                    break;
+                }
+                Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
+                    log::trace!("Tx wait for output (would block)");
+                    interrupt.signal_used_queue();
+                    output.wait_until_writable();
                 }
+                Err(e) => return Err(GuestMemoryError::IOError(e)),
             }
-        })
+        }
+    }
+    Ok(total)
 }

src/devices/src/virtio/descriptor_utils.rs

@@ -13,8 +13,9 @@ use std::result;
 
 use crate::virtio::queue::DescriptorChain;
 use vm_memory::{
-    Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap,
-    GuestMemoryRegion, Le16, Le32, Le64, VolatileMemory, VolatileMemoryError, VolatileSlice,
+    Address, ByteValued, Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryError,
+    GuestMemoryMmap, GuestMemoryRegion, Le16, Le32, Le64, VolatileMemory, VolatileMemoryError,
+    VolatileSlice,
 };
 
 use super::file_traits::{FileReadWriteAtVolatile, FileReadWriteVolatile};

src/devices/src/virtio/gpu/virtio_gpu.rs

@@ -36,7 +36,7 @@ use rutabaga_gfx::{
 };
 #[cfg(target_os = "macos")]
 use utils::worker_message::WorkerMessage;
-use vm_memory::{GuestAddress, GuestMemory, GuestMemoryMmap, VolatileSlice};
+use vm_memory::{GuestAddress, GuestMemoryBackend, GuestMemoryMmap, VolatileSlice};
 
 use super::{GpuError, Result};
 use crate::virtio::display::DisplayInfo;

src/devices/src/virtio/queue.rs

@@ -11,8 +11,8 @@ use std::num::Wrapping;
 use std::sync::atomic::{fence, Ordering};
 use virtio_bindings::virtio_ring::VRING_USED_F_NO_NOTIFY;
 use vm_memory::{
-    Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap,
-    VolatileMemoryError,
+    Address, ByteValued, Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryError,
+    GuestMemoryMmap, VolatileMemoryError,
 };
 
 /// Size of used ring header: flags (u16) + idx (u16)

src/devices/src/virtio/vsock/packet.rs

@@ -27,7 +27,7 @@ use std::result;
 use nix::sys::socket::{sockaddr, AddressFamily};
 use nix::sys::socket::{SockaddrLike, SockaddrStorage};
 use utils::byte_order;
-use vm_memory::{self, Address, GuestAddress, GuestMemory, GuestMemoryError};
+use vm_memory::{self, Address, GuestAddress, GuestMemoryBackend, GuestMemoryError};
 
 use super::super::DescriptorChain;
 use super::defs;
@@ -193,7 +193,7 @@ pub struct VsockPacket {
     buf_size: usize,
 }
 
-fn get_host_address<T: GuestMemory>(
+fn get_host_address<T: GuestMemoryBackend>(
     mem: &T,
     guest_addr: GuestAddress,
     size: usize,

src/kernel/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }
 
 utils = { path = "../utils" }

src/kernel/src/loader/mod.rs

@@ -12,7 +12,7 @@ use std::ffi::CString;
 use std::fmt;
 
 use super::cmdline::Error as CmdlineError;
-use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap};
+use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryMmap};
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum Error {

src/libkrun/Cargo.toml

@@ -42,8 +42,8 @@ kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
 kvm-ioctls = ">=0.21"
 aws-nitro = { path = "../aws_nitro", optional = true }
 nitro-enclaves = { version = "0.5.0", optional = true }
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }
 
 [lib]
 name = "krun"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "lib"]

src/smbios/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }

src/vmm/Cargo.toml

@@ -21,10 +21,10 @@ aws-nitro = []
 crossbeam-channel = ">=0.5.15"
 flate2 = "1.0.35"
 libc = ">=0.2.39"
-linux-loader = { version = "0.13.0", features = ["bzimage", "elf", "pe"] }
+linux-loader = { git = "https://github.com/d-e-s-o/linux-loader.git", branch = "topic/vm-memory-0.18", features = ["bzimage", "elf", "pe"] }
 log = "0.4.0"
 nix = { version = "0.30.1", features = ["fs", "term"] }
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory = { version = "0.18", features = ["backend-mmap"] }
 vmm-sys-util = ">=0.14"
 krun_display = { path = "../krun_display", optional = true, features = ["bindgen_clang_runtime"] }
 krun_input = { path = "../krun_input", optional = true, features = ["bindgen_clang_runtime"] }

src/vmm/src/builder.rs

@@ -94,7 +94,7 @@ use vm_memory::mmap::MmapRegion;
 use vm_memory::Address;
 use vm_memory::Bytes;
 #[cfg(not(feature = "aws-nitro"))]
-use vm_memory::GuestMemory;
+use vm_memory::GuestMemoryBackend;
 #[cfg(all(target_arch = "x86_64", not(feature = "tee")))]
 use vm_memory::GuestRegionMmap;
 use vm_memory::{GuestAddress, GuestMemoryMmap};
@@ -125,7 +125,7 @@ pub enum StartMicrovmError {
     /// Cannot read firmware contents from file.
     FirmwareRead(io::Error),
     /// Memory regions are overlapping or mmap fails.
-    GuestMemoryMmap(vm_memory::Error),
+    GuestMemoryMmap(String),
     /// The BZIP2 decoder couldn't decompress the kernel.
     ImageBz2Decoder(io::Error),
     /// Cannot find compressed kernel in file.
@@ -1339,9 +1339,13 @@ fn load_payload(
                 guest_mem
                     .insert_region(Arc::new(
                         GuestRegionMmap::new(kernel_region, GuestAddress(kernel_guest_addr))
-                            .map_err(StartMicrovmError::GuestMemoryMmap)?,
+                            .ok_or_else(|| {
+                                StartMicrovmError::GuestMemoryMmap(
+                                    "Failed to create GuestRegionMmap".to_string(),
+                                )
+                            })?,
                     ))
-                    .map_err(StartMicrovmError::GuestMemoryMmap)?,
+                    .map_err(|e| StartMicrovmError::GuestMemoryMmap(format!("{e:?}")))?,
                 GuestAddress(kernel_entry_addr),
                 None,
                 None,
@@ -1500,7 +1504,7 @@ pub fn create_guest_memory(
     arch_mem_regions.extend(shm_manager.regions());
 
     let guest_mem = GuestMemoryMmap::from_ranges(&arch_mem_regions)
-        .map_err(StartMicrovmError::GuestMemoryMmap)?;
+        .map_err(|e| StartMicrovmError::GuestMemoryMmap(format!("{e:?}")))?;
 
     let (guest_mem, entry_addr, initrd_config, cmdline) =
         load_payload(vm_resources, guest_mem, &arch_mem_info, payload)?;

src/vmm/src/linux/tee/amdsnp/mod.rs

@@ -13,7 +13,7 @@ use launch::{error::FirmwareError, firmware::Firmware, *};
 use kvm_bindings::{kvm_enc_region, CpuId, KVM_CPUID_FLAG_SIGNIFCANT_INDEX};
 use kvm_ioctls::VmFd;
 use vm_memory::{
-    Bytes, GuestAddress, GuestMemory, GuestMemoryMmap, GuestMemoryRegion, GuestRegionMmap,
+    Bytes, GuestAddress, GuestMemoryBackend, GuestMemoryMmap, GuestMemoryRegion, GuestRegionMmap,
 };
 
 #[derive(Debug)]

src/vmm/src/linux/vstate.rs

@@ -64,8 +64,8 @@ use utils::sm::StateMachine;
 #[cfg(feature = "tee")]
 use utils::worker_message::{MemoryProperties, WorkerMessage};
 use vm_memory::{
-    Address, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap, GuestMemoryRegion,
-    GuestRegionMmap,
+    Address, GuestAddress, GuestMemoryBackend, GuestMemoryError, GuestMemoryMmap,
+    GuestMemoryRegion, GuestRegionMmap,
 };
 
 #[cfg(feature = "amd-sev")]

src/vmm/src/macos/vstate.rs

@@ -24,7 +24,7 @@ use devices::legacy::VcpuList;
 use hvf::{HvfVcpu, HvfVm, VcpuExit, Vcpus};
 use utils::eventfd::EventFd;
 use vm_memory::{
-    Address, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap, GuestMemoryRegion,
+    Address, GuestAddress, GuestMemoryBackend, GuestMemoryError, GuestMemoryMmap, GuestMemoryRegion,
 };
 
 /// Errors associated with the wrappers over KVM ioctls.