refactor(vmm): copy part of utils to vmm/utils

Most modules in `utils` are `vmm` specific,
so copy them into `vmm/utils`. The actual
removal of those files from `utils` will
happen in later commit.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

Cargo.lock

@@ -43,6 +43,7 @@ vhost = { version = "0.11.0", features = ["vhost-user-frontend"] }
 vm-allocator = "0.1.0"
 vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
 vm-superio = "0.8.0"
+vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 zerocopy = { version = "0.7.35" }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]

src/vmm/Cargo.toml

@@ -29,7 +29,7 @@ pub enum VcpuError {
     /// Failed to set multiprocessor state: {0}
     SetMp(kvm_ioctls::Error),
     /// Failed FamStructWrapper operation: {0}
-    Fam(utils::fam::Error),
+    Fam(crate::utils::fam::Error),
     /// {0}
     GetMidrEl1(String),
 }

src/vmm/src/arch/aarch64/vcpu.rs

@@ -7,7 +7,8 @@
 
 use kvm_bindings::kvm_lapic_state;
 use kvm_ioctls::VcpuFd;
-use utils::byte_order;
+
+use crate::utils::byte_order;
 
 /// Errors thrown while configuring the LAPIC.
 #[derive(Debug, thiserror::Error, displaydoc::Display, PartialEq, Eq)]
@@ -103,7 +104,9 @@ mod tests {
 
     #[test]
     fn test_apic_delivery_mode() {
-        let mut v: Vec<u32> = (0..20).map(|_| utils::rand::xor_pseudo_rng_u32()).collect();
+        let mut v: Vec<u32> = (0..20)
+            .map(|_| crate::utils::rand::xor_pseudo_rng_u32())
+            .collect();
 
         v.iter_mut()
             .for_each(|x| *x = set_apic_delivery_mode(*x, 2));

src/vmm/src/arch/x86_64/interrupts.rs

@@ -24,10 +24,10 @@ pub mod gen;
 use linux_loader::configurator::linux::LinuxBootConfigurator;
 use linux_loader::configurator::{BootConfigurator, BootParams};
 use linux_loader::loader::bootparam::boot_params;
-use utils::u64_to_usize;
 
 use crate::arch::InitrdConfig;
 use crate::device_manager::resources::ResourceAllocator;
+use crate::utils::u64_to_usize;
 use crate::vstate::memory::{
     Address, GuestAddress, GuestMemory, GuestMemoryMmap, GuestMemoryRegion,
 };

src/vmm/src/arch/x86_64/mod.rs

@@ -16,7 +16,7 @@ use crate::cpu_config::x86_64::cpuid::common::GetCpuidError;
 /// MSR related errors.
 pub enum MsrError {
     /// Failed to create `vmm_sys_util::fam::FamStructWrapper` for MSRs
-    Fam(#[from] utils::fam::Error),
+    Fam(#[from] crate::utils::fam::Error),
     /// Failed to get MSR index list: {0}
     GetMsrIndexList(kvm_ioctls::Error),
     /// Invalid CPU vendor: {0}

src/vmm/src/arch/x86_64/msr.rs

@@ -44,7 +44,7 @@ pub enum RegsError {
 /// Error type for [`setup_fpu`].
 #[derive(Debug, derive_more::From, PartialEq, Eq, thiserror::Error)]
 #[error("Failed to setup FPU: {0}")]
-pub struct SetupFpuError(utils::errno::Error);
+pub struct SetupFpuError(crate::utils::errno::Error);
 
 /// Configure Floating-Point Unit (FPU) registers for a given CPU.
 ///
@@ -68,7 +68,7 @@ pub fn setup_fpu(vcpu: &VcpuFd) -> Result<(), SetupFpuError> {
 /// Error type of [`setup_regs`].
 #[derive(Debug, derive_more::From, PartialEq, Eq, thiserror::Error)]
 #[error("Failed to setup registers: {0}")]
-pub struct SetupRegistersError(utils::errno::Error);
+pub struct SetupRegistersError(crate::utils::errno::Error);
 
 /// Configure base registers for a given CPU.
 ///
@@ -103,13 +103,13 @@ pub fn setup_regs(vcpu: &VcpuFd, boot_ip: u64) -> Result<(), SetupRegistersError
 #[derive(Debug, thiserror::Error, displaydoc::Display, PartialEq, Eq)]
 pub enum SetupSpecialRegistersError {
     /// Failed to get special registers: {0}
-    GetSpecialRegisters(utils::errno::Error),
+    GetSpecialRegisters(crate::utils::errno::Error),
     /// Failed to configure segments and special registers: {0}
     ConfigureSegmentsAndSpecialRegisters(RegsError),
     /// Failed to setup page tables: {0}
     SetupPageTables(RegsError),
     /// Failed to set special registers: {0}
-    SetSpecialRegisters(utils::errno::Error),
+    SetSpecialRegisters(crate::utils::errno::Error),
 }
 
 /// Configures the special registers and system page tables for a given CPU.

src/vmm/src/arch/x86_64/regs.rs

@@ -19,9 +19,7 @@ use linux_loader::loader::pe::PE as Loader;
 use linux_loader::loader::KernelLoader;
 use seccompiler::BpfThreadMap;
 use userfaultfd::Uffd;
-use utils::eventfd::EventFd;
 use utils::time::TimestampUs;
-use utils::u64_to_usize;
 use vm_memory::ReadVolatile;
 #[cfg(target_arch = "aarch64")]
 use vm_superio::Rtc;
@@ -61,6 +59,8 @@ use crate::logger::{debug, error};
 use crate::persist::{MicrovmState, MicrovmStateError};
 use crate::resources::VmResources;
 use crate::snapshot::Persist;
+use crate::utils::eventfd::EventFd;
+use crate::utils::u64_to_usize;
 use crate::vmm_config::boot_source::BootConfig;
 use crate::vmm_config::instance_info::InstanceInfo;
 use crate::vmm_config::machine_config::{VmConfig, VmConfigError};
@@ -412,7 +412,7 @@ pub enum BuildMicrovmFromSnapshotError {
     /// Failed to create microVM and vCPUs: {0}
     CreateMicrovmAndVcpus(#[from] StartMicrovmError),
     /// Could not access KVM: {0}
-    KvmAccess(#[from] utils::errno::Error),
+    KvmAccess(#[from] crate::utils::errno::Error),
     /// Error configuring the TSC, frequency not present in the given snapshot.
     TscFrequencyNotPresent,
     #[cfg(target_arch = "x86_64")]
@@ -1022,7 +1022,6 @@ pub mod tests {
     use std::io::Write;
 
     use linux_loader::cmdline::Cmdline;
-    use utils::tempfile::TempFile;
 
     use super::*;
     use crate::arch::DeviceType;
@@ -1034,6 +1033,7 @@ pub mod tests {
     use crate::mmds::data_store::{Mmds, MmdsVersion};
     use crate::mmds::ns::MmdsNetworkStack;
     use crate::test_utils::{arch_mem, single_region_mem, single_region_mem_at};
+    use crate::utils::tempfile::TempFile;
     use crate::vmm_config::balloon::{BalloonBuilder, BalloonDeviceConfig, BALLOON_DEV_ID};
     use crate::vmm_config::boot_source::DEFAULT_KERNEL_CMDLINE;
     use crate::vmm_config::drive::{BlockBuilder, BlockDeviceConfig};

src/vmm/src/builder.rs

@@ -410,7 +410,7 @@ impl TryFrom<kvm_bindings::CpuId> for Cpuid {
 }
 
 impl TryFrom<Cpuid> for kvm_bindings::CpuId {
-    type Error = utils::fam::Error;
+    type Error = crate::utils::fam::Error;
 
     fn try_from(cpuid: Cpuid) -> Result<Self, Self::Error> {
         let entries = cpuid

src/vmm/src/cpu_config/x86_64/cpuid/mod.rs

@@ -12,12 +12,12 @@ use std::sync::{Arc, Mutex};
 use acpi_tables::{aml, Aml};
 use kvm_ioctls::VmFd;
 use libc::EFD_NONBLOCK;
-use utils::eventfd::EventFd;
 use vm_superio::Serial;
 
 use crate::devices::bus::BusDevice;
 use crate::devices::legacy::serial::SerialOut;
 use crate::devices::legacy::{EventFdTrigger, SerialDevice, SerialEventsWrapper};
+use crate::utils::eventfd::EventFd;
 
 /// Errors corresponding to the `PortIODeviceManager`.
 #[derive(Debug, derive_more::From, thiserror::Error, displaydoc::Display)]