Merge branch 'main' into feat/kvm_clock_ctr_gdb

roypat · web-flow · commit 7cc8229a1331 · 2025-01-24T12:04:26.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/hugepages.md b/docs/hugepages.md
@@ -1,10 +1,5 @@
 # Backing Guest Memory by Huge Pages
 
-> [!WARNING]
->
-> Support is currently in **developer preview**. See
-> [this section](RELEASE_POLICY.md#developer-preview-features) for more info.
-
 Firecracker supports backing the guest memory of a VM by 2MB hugetlbfs pages.
 This can be enabled by setting the `huge_pages` field of `PUT` or `PATCH`
 requests to the `/machine-config` endpoint to `2M`.
@@ -44,7 +39,6 @@ Currently, hugetlbfs support is mutually exclusive with the following
 Firecracker features:
 
 - Memory Ballooning via the [Balloon Device](./ballooning.md)
-- Initrd
 
 ## FAQ
 
diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -10,15 +10,15 @@ name = "clippy-tracing"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.26", features = ["derive"] }
+clap = { version = "4.5.27", features = ["derive"] }
 itertools = "0.14.0"
 proc-macro2 = { version = "1.0.93", features = ["span-locations"] }
 quote = "1.0.38"
 syn = { version = "2.0.96", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]
-uuid = { version = "1.12.0", features = ["v4"] }
+uuid = { version = "1.12.1", features = ["v4"] }
 
 [lints]
 workspace = true
diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -10,7 +10,7 @@ name = "cpu-template-helper"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.26", features = ["derive", "string"] }
+clap = { version = "4.5.27", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 libc = "0.2.169"
 log-instrument = { path = "../log-instrument", optional = true }
diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -17,7 +17,7 @@ bench = false
 
 [dependencies]
 bincode = "1.2.1"
-clap = { version = "4.5.23", features = ["derive", "string"] }
+clap = { version = "4.5.27", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 libc = "0.2.169"
 serde = { version = "1.0.217", features = ["derive"] }
diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -10,7 +10,7 @@ name = "snapshot-editor"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.26", features = ["derive", "string"] }
+clap = { version = "4.5.27", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -12,7 +12,7 @@ bench = false
 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.12.1", features = ["bindgen"] }
+aws-lc-rs = { version = "1.12.2", features = ["bindgen"] }
 base64 = "0.22.1"
 bincode = "1.2.1"
 bitflags = "2.8.0"
diff --git a/src/vmm/src/devices/virtio/queue.rs b/src/vmm/src/devices/virtio/queue.rs
@@ -803,10 +803,11 @@ mod verification {
     const GUEST_MEMORY_BASE: u64 = 512;
 
     // We size our guest memory to fit a properly aligned queue, plus some wiggles bytes
-    // to make sure we not only test queues where all segments are consecutively aligned.
+    // to make sure we not only test queues where all segments are consecutively aligned (at least
+    // for those proofs that use a completely arbitrary queue structure).
     // We need to give at least 16 bytes of buffer space for the descriptor table to be
     // able to change its address, as it is 16-byte aligned.
-    const GUEST_MEMORY_SIZE: usize = QUEUE_END as usize + 30;
+    const GUEST_MEMORY_SIZE: usize = (QUEUE_END - QUEUE_BASE_ADDRESS) as usize + 30;
 
     fn guest_memory(memory: *mut u8) -> ProofGuestMemory {
         // Ideally, we'd want to do
@@ -876,8 +877,7 @@ mod verification {
     const USED_RING_BASE_ADDRESS: u64 =
         AVAIL_RING_BASE_ADDRESS + 6 + 2 * FIRECRACKER_MAX_QUEUE_SIZE as u64 + 2;
 
-    /// The address of the first byte after the queue. Since our queue starts at guest physical
-    /// address 0, this is also the size of the memory area occupied by the queue.
+    /// The address of the first byte after the queue (which starts at QUEUE_BASE_ADDRESS).
     /// Note that the used ring structure has size 6 + 8 * FIRECRACKER_MAX_QUEUE_SIZE
     const QUEUE_END: u64 = USED_RING_BASE_ADDRESS + 6 + 8 * FIRECRACKER_MAX_QUEUE_SIZE as u64;
 
diff --git a/src/vmm/src/resources.rs b/src/vmm/src/resources.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::cpu_config::templates::CustomCpuTemplate;
 use crate::device_manager::persist::SharedDeviceType;
-use crate::logger::{info, log_dev_preview_warning};
+use crate::logger::info;
 use crate::mmds;
 use crate::mmds::data_store::{Mmds, MmdsVersion};
 use crate::mmds::ns::MmdsNetworkStack;
@@ -246,10 +246,6 @@ impl VmResources {
         &mut self,
         update: &MachineConfigUpdate,
     ) -> Result<(), MachineConfigError> {
-        if update.huge_pages.is_some() && update.huge_pages != Some(HugePageConfig::None) {
-            log_dev_preview_warning("Huge pages support", None);
-        }
-
         let updated = self.machine_config.update(update)?;
 
         // The VM cannot have a memory size smaller than the target size
@@ -268,13 +264,6 @@ impl VmResources {
         if self.balloon.get().is_some() && updated.huge_pages != HugePageConfig::None {
             return Err(MachineConfigError::BalloonAndHugePages);
         }
-
-        if self.boot_source.config.initrd_path.is_some()
-            && updated.huge_pages != HugePageConfig::None
-        {
-            return Err(MachineConfigError::InitrdAndHugePages);
-        }
-
         self.machine_config = updated;
 
         Ok(())
@@ -341,12 +330,6 @@ impl VmResources {
         &mut self,
         boot_source_cfg: BootSourceConfig,
     ) -> Result<(), BootSourceConfigError> {
-        if boot_source_cfg.initrd_path.is_some()
-            && self.machine_config.huge_pages != HugePageConfig::None
-        {
-            return Err(BootSourceConfigError::HugePagesAndInitRd);
-        }
-
         self.boot_source = BootSource {
             builder: Some(BootConfig::new(&boot_source_cfg)?),
             config: boot_source_cfg,
diff --git a/src/vmm/src/vmm_config/boot_source.rs b/src/vmm/src/vmm_config/boot_source.rs
@@ -42,8 +42,6 @@ pub enum BootSourceConfigError {
     InvalidInitrdPath(io::Error),
     /// The kernel command line is invalid: {0}
     InvalidKernelCommandLine(String),
-    /// Firecracker's huge pages support is incompatible with initrds.
-    HugePagesAndInitRd,
 }
 
 /// Holds the kernel specification (both configuration as well as runtime details).
diff --git a/src/vmm/src/vmm_config/machine_config.rs b/src/vmm/src/vmm_config/machine_config.rs
@@ -31,8 +31,6 @@ pub enum MachineConfigError {
     KernelVersion,
     /// Firecracker's huge pages support is incompatible with memory ballooning.
     BalloonAndHugePages,
-    /// Firecracker's huge pages support is incompatible with initrds.
-    InitrdAndHugePages,
 }
 
 /// Describes the possible (huge)page configurations for a microVM's memory.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -498,20 +498,6 @@ def uvm_plain_debug(microvm_factory, guest_kernel_6_1_debug, rootfs_rw):
     return microvm_factory.build(guest_kernel_6_1_debug, rootfs_rw)
 
 
-@pytest.fixture
-def uvm_with_initrd(
-    microvm_factory, guest_kernel_linux_5_10, record_property, artifact_dir
-):
-    """
-    See file:../docs/initrd.md
-    """
-    fs = artifact_dir / "initramfs.cpio"
-    record_property("rootfs", fs.name)
-    uvm = microvm_factory.build(guest_kernel_linux_5_10)
-    uvm.initrd_file = fs
-    yield uvm
-
-
 @pytest.fixture
 def vcpu_count():
     """Return default vcpu_count. Use indirect parametrization to override."""
diff --git a/tests/integration_tests/functional/test_net.py b/tests/integration_tests/functional/test_net.py
@@ -115,9 +115,8 @@ def test_tap_offload(uvm_any):
     )
 
     # Try to send a UDP message from host with UDP offload enabled
-    cmd = f"ip netns exec {vm.ssh.netns} python3 ./host_tools/udp_offload.py {vm.ssh.host} {port}"
-    utils.check_output(cmd)
+    vm.netns.check_output(f"python3 ./host_tools/udp_offload.py {vm.ssh.host} {port}")
 
     # Check that the server received the message
-    ret = vm.ssh.run(f"cat {out_filename}")
+    ret = vm.ssh.run(f"sync ; cat {out_filename}")
     assert ret.stdout == message, f"{ret.stdout=} {ret.stderr=}"
diff --git a/tests/integration_tests/performance/test_huge_pages.py b/tests/integration_tests/performance/test_huge_pages.py
@@ -251,41 +251,3 @@ def test_negative_huge_pages_plus_balloon(uvm_plain):
         match="Machine config error: Firecracker's huge pages support is incompatible with memory ballooning.",
     ):
         uvm_plain.basic_config(huge_pages=HugePagesConfig.HUGETLBFS_2MB)
-
-
-def test_negative_huge_pages_plus_initrd(uvm_with_initrd):
-    """Tests that huge pages and initrd cannot be used together"""
-    uvm_with_initrd.jailer.daemonize = False
-    uvm_with_initrd.spawn()
-    uvm_with_initrd.memory_monitor = None
-
-    # Ensure setting huge pages and then telling FC to boot an initrd does not work
-    with pytest.raises(
-        RuntimeError,
-        match="Boot source error: Firecracker's huge pages support is incompatible with initrds.",
-    ):
-        # `basic_config` first does a PUT to /machine-config, which will apply the huge pages configuration,
-        # and then a PUT to /boot-source, which will register the initrd
-        uvm_with_initrd.basic_config(
-            boot_args="console=ttyS0 reboot=k panic=1 pci=off",
-            use_initrd=True,
-            huge_pages=HugePagesConfig.HUGETLBFS_2MB,
-            add_root_device=False,
-            vcpu_count=1,
-        )
-
-    # Ensure telling FC about the initrd first and then setting huge pages doesn't work
-    # This first does a PUT to /machine-config to reset the huge pages configuration, before doing a
-    # PUT to /boot-source to register the initrd
-    uvm_with_initrd.basic_config(
-        huge_pages=HugePagesConfig.NONE,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
-        use_initrd=True,
-    )
-    with pytest.raises(
-        RuntimeError,
-        match="Machine config error: Firecracker's huge pages support is incompatible with initrds.",
-    ):
-        uvm_with_initrd.api.machine_config.patch(
-            huge_pages=HugePagesConfig.HUGETLBFS_2MB
-        )
diff --git a/tests/integration_tests/performance/test_initrd.py b/tests/integration_tests/performance/test_initrd.py
diff --git a/tools/devtool b/tools/devtool

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ pub enum BootSourceConfigError {`
`42`	`42`	`InvalidInitrdPath(io::Error),`
`43`	`43`	`/// The kernel command line is invalid: {0}`
`44`	`44`	`InvalidKernelCommandLine(String),`
`45`		`- /// Firecracker's huge pages support is incompatible with initrds.`
`46`		`- HugePagesAndInitRd,`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`/// Holds the kernel specification (both configuration as well as runtime details).`