Merge branch 'main' into fair_devices_2

Author: Manciukic

.buildkite/pipeline_cpu_template.py

@@ -88,16 +88,18 @@ def group_snapshot_restore(test_step):
     groups = []
 
     groups.append(
-        group(
-            label=test_step["snapshot"][BkStep.LABEL],
-            command=test_step["snapshot"][BkStep.COMMAND],
-            instances=test_step["instances"],
-            platforms=DEFAULT_PLATFORMS,
-            timeout=test_step["snapshot"][BkStep.TIMEOUT],
-            artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
-        )
+        {
+            "key": "snapshot",
+            **group(
+                label=test_step["snapshot"][BkStep.LABEL],
+                command=test_step["snapshot"][BkStep.COMMAND],
+                instances=test_step["instances"],
+                platforms=DEFAULT_PLATFORMS,
+                timeout=test_step["snapshot"][BkStep.TIMEOUT],
+                artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
+            ),
+        }
     )
-    groups.append("wait")
     snapshot_restore_combinations = []
     for dp in DEFAULT_PLATFORMS:
         for src_instance in test_step["instances"]:
@@ -137,7 +139,9 @@ def group_snapshot_restore(test_step):
             }
         )
 
-    groups.append({"group": "📸 restores snapshots", "steps": steps})
+    groups.append(
+        {"group": "📸 restores snapshots", "steps": steps, "depends_on": "snapshot"}
+    )
     return groups
 
 

.buildkite/pipeline_perf.py

@@ -18,41 +18,41 @@
 perf_test = {
     "virtio-block-sync": {
         "label": "💿 Virtio Sync Block Performance",
-        "tests": "integration_tests/performance/test_block_ab.py::test_block_performance -k 'not Async'",
+        "tests": "integration_tests/performance/test_block.py::test_block_performance -k 'not Async'",
         "devtool_opts": "-c 1-10 -m 0",
     },
     "virtio-block-async": {
         "label": "💿 Virtio Async Block Performance",
-        "tests": "integration_tests/performance/test_block_ab.py::test_block_performance -k Async",
+        "tests": "integration_tests/performance/test_block.py::test_block_performance -k Async",
         "devtool_opts": "-c 1-10 -m 0",
     },
     "vhost-user-block": {
         "label": "💿 vhost-user Block Performance",
-        "tests": "integration_tests/performance/test_block_ab.py::test_block_vhost_user_performance",
+        "tests": "integration_tests/performance/test_block.py::test_block_vhost_user_performance",
         "devtool_opts": "-c 1-10 -m 0",
         "ab_opts": "--noise-threshold 0.1",
     },
     "network": {
         "label": "📠 Network Latency and Throughput",
-        "tests": "integration_tests/performance/test_network_ab.py",
+        "tests": "integration_tests/performance/test_network.py",
         "devtool_opts": "-c 1-10 -m 0",
         # Triggers if delta is > 0.01ms (10µs) or default relative threshold (5%)
         # only relevant for latency test, throughput test will always be magnitudes above this anyway
         "ab_opts": "--absolute-strength 0.010",
     },
     "snapshot-latency": {
         "label": "📸 Snapshot Latency",
-        "tests": "integration_tests/performance/test_snapshot_ab.py::test_restore_latency integration_tests/performance/test_snapshot_ab.py::test_post_restore_latency",
+        "tests": "integration_tests/performance/test_snapshot.py::test_restore_latency integration_tests/performance/test_snapshot.py::test_post_restore_latency integration_tests/performance/test_snapshot.py::test_snapshot_create_latency",
         "devtool_opts": "-c 1-12 -m 0",
     },
     "population-latency": {
         "label": "📸 Memory Population Latency",
-        "tests": "integration_tests/performance/test_snapshot_ab.py::test_population_latency",
+        "tests": "integration_tests/performance/test_snapshot.py::test_population_latency",
         "devtool_opts": "-c 1-12 -m 0",
     },
     "vsock-throughput": {
         "label": "🧦 Vsock Throughput",
-        "tests": "integration_tests/performance/test_vsock_ab.py",
+        "tests": "integration_tests/performance/test_vsock.py",
         "devtool_opts": "-c 1-10 -m 0",
     },
     "memory-overhead": {

Cargo.lock

@@ -113,7 +113,7 @@ wget "https://s3.amazonaws.com/spec.ccfc.min/${latest_kernel_key}"
 latest_ubuntu_key=$(curl "http://spec.ccfc.min.s3.amazonaws.com/?prefix=firecracker-ci/$CI_VERSION/$ARCH/ubuntu-&list-type=2" \
     | grep -oP "(?<=<Key>)(firecracker-ci/$CI_VERSION/$ARCH/ubuntu-[0-9]+\.[0-9]+\.squashfs)(?=</Key>)" \
     | sort -V | tail -1)
-ubuntu_version=$(basename $latest_ubuntu_key .sqashfs | grep -oE '[0-9]+\.[0-9]+')
+ubuntu_version=$(basename $latest_ubuntu_key .squashfs | grep -oE '[0-9]+\.[0-9]+')
 
 # Download a rootfs
 wget -O ubuntu-$ubuntu_version.squashfs.upstream "https://s3.amazonaws.com/spec.ccfc.min/$latest_ubuntu_key"

docs/getting-started.md

@@ -10,11 +10,11 @@ name = "clippy-tracing"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.39", features = ["derive"] }
+clap = { version = "4.5.40", features = ["derive"] }
 itertools = "0.14.0"
 proc-macro2 = { version = "1.0.95", features = ["span-locations"] }
 quote = "1.0.40"
-syn = { version = "2.0.101", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+syn = { version = "2.0.103", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

src/clippy-tracing/Cargo.toml

@@ -13,9 +13,9 @@ bench = false
 tracing = ["log-instrument", "vmm/tracing"]
 
 [dependencies]
-clap = { version = "4.5.39", features = ["derive", "string"] }
+clap = { version = "4.5.40", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.172"
+libc = "0.2.173"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"

src/cpu-template-helper/Cargo.toml

@@ -22,7 +22,7 @@ gdb = ["vmm/gdb"]
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.1"
-libc = "0.2.172"
+libc = "0.2.173"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 serde = { version = "1.0.219", features = ["derive"] }
@@ -41,7 +41,7 @@ serde_json = "1.0.140"
 
 [dev-dependencies]
 cargo_toml = "0.22.1"
-libc = "0.2.172"
+libc = "0.2.173"
 regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples

src/firecracker/Cargo.toml

@@ -15,7 +15,7 @@ bench = false
 tracing = ["log-instrument", "utils/tracing"]
 
 [dependencies]
-libc = "0.2.172"
+libc = "0.2.173"
 log-instrument = { path = "../log-instrument", optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std"] }
 thiserror = "2.0.12"