refactor: remove files from utils that are vmm specific

In previous commit we moved `vmm` specific parts of `utils`
into `vmm` crate, so now we can remove them from `utils`.

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

Author: ShadowCurse

src/firecracker/examples/uffd/uffd_utils.rs

@@ -299,8 +299,8 @@ mod tests {
     use std::mem::MaybeUninit;
     use std::os::unix::net::UnixListener;
 
-    use utils::tempdir::TempDir;
-    use utils::tempfile::TempFile;
+    use vmm::utils::tempdir::TempDir;
+    use vmm::utils::tempfile::TempFile;
 
     use super::*;
 

src/firecracker/src/api_server/mod.rs

@@ -17,6 +17,7 @@ use parsed_request::{ParsedRequest, RequestAction};
 use seccompiler::BpfProgramRef;
 use serde_json::json;
 use utils::eventfd::EventFd;
+use utils::time::{get_time_us, ClockType};
 use vmm::logger::{
     debug, error, info, update_metric_with_elapsed_time, warn, ProcessTimeReporter, METRICS,
 };
@@ -101,17 +102,15 @@ impl ApiServer {
                 }
             };
             for server_request in request_vec {
-                let request_processing_start_us =
-                    utils::time::get_time_us(utils::time::ClockType::Monotonic);
+                let request_processing_start_us = get_time_us(ClockType::Monotonic);
                 // Use `self.handle_request()` as the processing callback.
                 let response = server_request
                     .process(|request| self.handle_request(request, request_processing_start_us));
                 if let Err(err) = server.respond(response) {
                     error!("API Server encountered an error on response: {}", err);
                 };
 
-                let delta_us = utils::time::get_time_us(utils::time::ClockType::Monotonic)
-                    - request_processing_start_us;
+                let delta_us = get_time_us(ClockType::Monotonic) - request_processing_start_us;
                 debug!("Total previous API call duration: {} us.", delta_us);
             }
         }
@@ -259,7 +258,7 @@ mod tests {
         // latencies_us.pause_vm metric can be set to 0, failing the assertion below. By
         // subtracting 1 we assure that the metric will always be set to at least 1 (if it gets set
         // at all, which is what this test is trying to prove).
-        let start_time_us = utils::time::get_time_us(ClockType::Monotonic) - 1;
+        let start_time_us = get_time_us(ClockType::Monotonic) - 1;
         assert_eq!(METRICS.latencies_us.pause_vm.fetch(), 0);
         to_api.send(Box::new(Ok(VmmData::Empty))).unwrap();
         let response =

src/jailer/src/env.rs

@@ -13,6 +13,7 @@ use std::{fmt, io};
 
 use utils::arg_parser::UtilsArgParserError::MissingValue;
 use utils::syscall::SyscallReturnCode;
+use utils::time::{get_time_us, ClockType};
 use utils::{arg_parser, validators};
 
 use crate::cgroup::{CgroupConfiguration, CgroupConfigurationBuilder};
@@ -663,7 +664,7 @@ impl Env {
         // Daemonize before exec, if so required (when the dev_null variable != None).
         if let Some(dev_null) = dev_null {
             // Meter CPU usage before fork()
-            self.jailer_cpu_time_us = utils::time::get_time_us(utils::time::ClockType::ProcessCpu);
+            self.jailer_cpu_time_us = get_time_us(ClockType::ProcessCpu);
 
             // We follow the double fork method to daemonize the jailer referring to
             // https://0xjet.github.io/3OHA/2022/04/11/post.html
@@ -688,7 +689,7 @@ impl Env {
                 .map_err(JailerError::SetSid)?;
 
             // Meter CPU usage before fork()
-            self.jailer_cpu_time_us += utils::time::get_time_us(utils::time::ClockType::ProcessCpu);
+            self.jailer_cpu_time_us += get_time_us(ClockType::ProcessCpu);
 
             // Daemons should not have controlling terminals.
             // If a daemon has a controlling terminal, it can receive signals
@@ -714,8 +715,7 @@ impl Env {
         }
 
         // Compute jailer's total CPU time up to the current time.
-        self.jailer_cpu_time_us +=
-            utils::time::get_time_us(utils::time::ClockType::ProcessCpu) - self.start_time_cpu_us;
+        self.jailer_cpu_time_us += get_time_us(ClockType::ProcessCpu) - self.start_time_cpu_us;
         // Reset process start time.
         self.start_time_cpu_us = 0;
 

src/jailer/src/main.rs

@@ -9,6 +9,7 @@ use std::{env as p_env, fs, io};
 use env::PROC_MOUNTS;
 use utils::arg_parser::{ArgParser, Argument, UtilsArgParserError as ParsingError};
 use utils::syscall::SyscallReturnCode;
+use utils::time::{get_time_us, ClockType};
 use utils::validators;
 
 use crate::env::Env;
@@ -334,8 +335,8 @@ fn main_exec() -> Result<(), JailerError> {
 
     Env::new(
         arguments,
-        utils::time::get_time_us(utils::time::ClockType::Monotonic),
-        utils::time::get_time_us(utils::time::ClockType::ProcessCpu),
+        get_time_us(ClockType::Monotonic),
+        get_time_us(ClockType::ProcessCpu),
         PROC_MOUNTS,
     )
     .and_then(|env| {

src/rebase-snap/src/main.rs

@@ -8,7 +8,6 @@ use std::os::unix::io::AsRawFd;
 
 use utils::arg_parser::{ArgParser, Argument, Arguments, UtilsArgParserError as ArgError};
 use utils::seek_hole::SeekHole;
-use utils::u64_to_usize;
 
 const REBASE_SNAP_VERSION: &str = env!("CARGO_PKG_VERSION");
 const BASE_FILE: &str = "base-file";
@@ -104,7 +103,7 @@ fn rebase(base_file: &mut File, diff_file: &mut File) -> Result<(), FileError> {
                     base_file.as_raw_fd(),
                     diff_file.as_raw_fd(),
                     (&mut cursor as *mut u64).cast::<i64>(),
-                    u64_to_usize(block_end.saturating_sub(cursor)),
+                    usize::try_from(block_end.saturating_sub(cursor)).unwrap(),
                 )
             };
             if num_transferred_bytes < 0 {

src/snapshot-editor/src/edit_memory.rs

@@ -8,7 +8,7 @@ use std::path::PathBuf;
 
 use clap::Subcommand;
 use fc_utils::seek_hole::SeekHole;
-use fc_utils::u64_to_usize;
+use vmm::utils::u64_to_usize;
 
 #[derive(Debug, thiserror::Error, displaydoc::Display)]
 pub enum EditMemoryError {

src/snapshot-editor/src/utils.rs

@@ -4,10 +4,10 @@
 use std::fs::{File, OpenOptions};
 use std::path::PathBuf;
 
-use fc_utils::u64_to_usize;
 use semver::Version;
 use vmm::persist::MicrovmState;
 use vmm::snapshot::Snapshot;
+use vmm::utils::u64_to_usize;
 
 // Some errors are only used in aarch64 code
 #[allow(unused)]

src/utils/src/byte_order.rs

@@ -12,45 +12,5 @@ pub use vmm_sys_util::{
 };
 
 pub mod arg_parser;
-pub mod byte_order;
-pub mod net;
-pub mod signal;
-pub mod sm;
 pub mod time;
 pub mod validators;
-
-use std::num::Wrapping;
-use std::result::Result;
-
-/// Return the default page size of the platform, in bytes.
-pub fn get_page_size() -> Result<usize, errno::Error> {
-    // SAFETY: Safe because the parameters are valid.
-    match unsafe { libc::sysconf(libc::_SC_PAGESIZE) } {
-        -1 => Err(errno::Error::last()),
-        ps => Ok(usize::try_from(ps).unwrap()),
-    }
-}
-
-/// Safely converts a u64 value to a usize value.
-/// This bypasses the Clippy lint check because we only support 64-bit platforms.
-#[cfg(target_pointer_width = "64")]
-#[inline]
-#[allow(clippy::cast_possible_truncation)]
-pub const fn u64_to_usize(num: u64) -> usize {
-    num as usize
-}
-
-/// Safely converts a usize value to a u64 value.
-/// This bypasses the Clippy lint check because we only support 64-bit platforms.
-#[cfg(target_pointer_width = "64")]
-#[inline]
-#[allow(clippy::cast_possible_truncation)]
-pub const fn usize_to_u64(num: usize) -> u64 {
-    num as u64
-}
-
-/// Converts a usize into a wrapping u32.
-#[inline]
-pub const fn wrap_usize_to_u32(num: usize) -> Wrapping<u32> {
-    Wrapping(((num as u64) & 0xFFFFFFFF) as u32)
-}