Merge

Author: ValentaTomas

.tool-versions

@@ -1 +1 @@
-rust 1.85.0
+rust 1.79.0

Cargo.lock

@@ -125,6 +125,7 @@ pub fn build_microvm_from_config(
         state: VmState::NotStarted,
         vmm_version: CPU_TEMPLATE_HELPER_VERSION.to_string(),
         app_name: "cpu-template-helper".to_string(),
+        memory_regions: None,
     };
     let mut vm_resources =
         VmResources::from_json(&config, &instance_info, HTTP_MAX_PAYLOAD_SIZE, None)

src/cpu-template-helper/src/utils/mod.rs

@@ -35,7 +35,10 @@ vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 [dev-dependencies]
 cargo_toml = "0.20.5"
 libc = "0.2.161"
-regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
+regex = { version = "1.11.1", default-features = false, features = [
+  "std",
+  "unicode-perl",
+] }
 
 # Dev-Dependencies for uffd examples
 serde = { version = "1.0.214", features = ["derive"] }
@@ -48,7 +51,12 @@ serde = { version = "1.0.214" }
 serde_json = "1.0.132"
 
 [features]
-tracing = ["log-instrument", "seccompiler/tracing", "utils/tracing", "vmm/tracing"]
+tracing = [
+  "log-instrument",
+  "seccompiler/tracing",
+  "utils/tracing",
+  "vmm/tracing",
+]
 gdb = ["vmm/gdb"]
 
 [lints]

src/firecracker/Cargo.toml

@@ -9,15 +9,18 @@ license = "Apache-2.0"
 bench = false
 
 [dependencies]
-acpi_tables = { path = "../acpi-tables" } 
-aes-gcm =  { version = "0.10.1", default-features = false, features = ["aes"] }
+acpi_tables = { path = "../acpi-tables" }
+aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
 arrayvec = { version = "0.7.6", optional = true }
 aws-lc-rs = { version = "1.10.0", features = ["bindgen"] }
 base64 = "0.22.1"
 bincode = "1.2.1"
 bitflags = "2.6.0"
 crc64 = "2.0.0"
-derive_more = { version = "1.0.0", default-features = false, features = ["from", "display"] }
+derive_more = { version = "1.0.0", default-features = false, features = [
+  "from",
+  "display",
+] }
 displaydoc = "0.2.5"
 event-manager = "0.4.0"
 gdbstub = { version = "0.7.3", optional = true }
@@ -43,7 +46,10 @@ userfaultfd = "0.8.1"
 utils = { path = "../utils" }
 vhost = { version = "0.13.0", features = ["vhost-user-frontend"] }
 vm-allocator = "0.1.0"
-vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-bitmap"] }
+vm-memory = { version = "0.16.0", features = [
+  "backend-mmap",
+  "backend-bitmap",
+] }
 vm-superio = "0.8.0"
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 zerocopy = { version = "0.8.8" }
@@ -80,3 +86,8 @@ harness = false
 
 [lints]
 workspace = true
+
+[patch.crates-io]
+aws-lc-sys = "=0.29.0"
+aws-lc-rs = "=1.13.1"
+aws-lc-fips-sys = "=0.13.7"

src/vmm/Cargo.toml

@@ -153,6 +153,7 @@ use crate::vstate::memory::{
 use crate::vstate::vcpu::VcpuState;
 pub use crate::vstate::vcpu::{Vcpu, VcpuConfig, VcpuEvent, VcpuHandle, VcpuResponse};
 pub use crate::vstate::vm::Vm;
+use serde::{Deserialize, Serialize};
 
 /// Shorthand type for the EventManager flavour used by Firecracker.
 pub type EventManager = BaseEventManager<Arc<Mutex<dyn MutEventSubscriber>>>;
@@ -191,6 +192,20 @@ pub enum FcExitCode {
     ArgParsing = 153,
 }
 
+/// Describes the region of guest memory that can be used for creating the memfile.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
+pub struct GuestMemoryRegionMapping {
+    /// Base host virtual address where the guest memory contents for this region
+    /// should be copied/populated.
+    pub base_host_virt_addr: u64,
+    /// Region size.
+    pub size: usize,
+    /// Offset in the backend file/buffer where the region contents are.
+    pub offset: u64,
+    /// The configured page size for this memory region.
+    pub page_size: usize,
+}
+
 /// Timeout used in recv_timeout, when waiting for a vcpu response on
 /// Pause/Resume/Save/Restore. A high enough limit that should not be reached during normal usage,
 /// used to detect a potential vcpu deadlock.
@@ -451,6 +466,21 @@ impl Vmm {
         &self.guest_memory
     }
 
+    pub fn guest_memory_mappings(&self, vm_info: &VmInfo) -> Vec<GuestMemoryRegionMapping> {
+        let mut offset = 0;
+        let mut mappings = Vec::new();
+        for mem_region in self.guest_memory().iter() {
+            mappings.push(GuestMemoryRegionMapping {
+                base_host_virt_addr: mem_region.as_ptr() as u64,
+                size: mem_region.size(),
+                offset,
+                page_size: vm_info.huge_pages.page_size_kib(),
+            });
+            offset += mem_region.size() as u64;
+        }
+        mappings
+    }
+
     /// Sets RDA bit in serial console
     pub fn emulate_serial_init(&self) -> Result<(), EmulateSerialInitError> {
         // When restoring from a previously saved state, there is no serial

src/vmm/src/lib.rs

@@ -651,9 +651,8 @@ impl RuntimeApiController {
 
                 let mut instance_info = locked_vmm.instance_info();
 
-                instance_info.memory_regions = locked_vmm
-                    .vm
-                    .guest_memory_mappings(&VmInfo::from(&self.vm_resources));
+                instance_info.memory_regions =
+                    locked_vmm.guest_memory_mappings(&VmInfo::from(&self.vm_resources));
 
                 Ok(VmmData::InstanceInformation(instance_info))
             }

src/vmm/src/rpc_interface.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 use std::fmt::{self, Display, Formatter};
 
-use crate::vstate::vm::GuestMemoryRegionMapping;
+use crate::GuestMemoryRegionMapping;
 use serde::{ser, Serialize};
 
 /// Enumerates microVM runtime states.
@@ -48,5 +48,6 @@ pub struct InstanceInfo {
     /// The name of the application that runs the microVM.
     pub app_name: String,
     /// The regions of the guest memory.
-    pub memory_regions: Vec<GuestMemoryRegionMapping>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub memory_regions: Option<Vec<GuestMemoryRegionMapping>>,
 }

src/vmm/src/vmm_config/instance_info.rs

@@ -27,20 +27,6 @@ use crate::cpu_config::templates::KvmCapability;
 use crate::utils::u64_to_usize;
 use crate::vstate::memory::{Address, GuestMemory, GuestMemoryMmap, GuestMemoryRegion};
 
-/// Describes the region of guest memory that can be used for creating the memfile.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
-pub struct GuestMemoryRegionMapping {
-    /// Base host virtual address where the guest memory contents for this region
-    /// should be copied/populated.
-    pub base_host_virt_addr: u64,
-    /// Region size.
-    pub size: usize,
-    /// Offset in the backend file/buffer where the region contents are.
-    pub offset: u64,
-    /// The configured page size for this memory region.
-    pub page_size: usize,
-}
-
 /// Errors associated with the wrappers over KVM ioctls.
 /// Needs `rustfmt::skip` to make multiline comments work
 #[rustfmt::skip]