Merge branch 'main' into v1.13.0-dev

zulinx86 · web-flow · commit f8a53f3df333 · 2025-04-23T08:35:52.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -10,9 +10,9 @@ name = "clippy-tracing"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.35", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }
 itertools = "0.14.0"
-proc-macro2 = { version = "1.0.94", features = ["span-locations"] }
+proc-macro2 = { version = "1.0.95", features = ["span-locations"] }
 quote = "1.0.40"
 syn = { version = "2.0.100", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -10,9 +10,9 @@ name = "cpu-template-helper"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.35", features = ["derive", "string"] }
+clap = { version = "4.5.37", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -18,7 +18,7 @@ bench = false
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.0"
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
@@ -33,7 +33,7 @@ vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [dev-dependencies]
 cargo_toml = "0.22.1"
-libc = "0.2.171"
+libc = "0.2.172"
 regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples
diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -12,7 +12,7 @@ name = "jailer"
 bench = false
 
 [dependencies]
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 regex = { version = "1.11.1", default-features = false, features = ["std"] }
 thiserror = "2.0.12"
diff --git a/src/log-instrument-macros/Cargo.toml b/src/log-instrument-macros/Cargo.toml
@@ -11,7 +11,7 @@ proc-macro = true
 bench = false
 
 [dependencies]
-proc-macro2 = "1.0.94"
+proc-macro2 = "1.0.95"
 quote = "1.0.40"
 syn = { version = "2.0.100", features = ["full", "extra-traits"] }
 
diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -11,7 +11,7 @@ bench = false
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.12"
 vmm-sys-util = "0.12.1"
diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -17,9 +17,9 @@ bench = false
 
 [dependencies]
 bincode = { version = "2.0.1", features = ["serde"] }
-clap = { version = "4.5.35", features = ["derive", "string"] }
+clap = { version = "4.5.37", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.171"
+libc = "0.2.172"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 thiserror = "2.0.12"
diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -10,11 +10,11 @@ name = "snapshot-editor"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.35", features = ["derive", "string"] }
+clap = { version = "4.5.37", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.26"
 thiserror = "2.0.12"
diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -10,7 +10,7 @@ bench = false
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.171"
+libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.12"
 
diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -24,7 +24,7 @@ gdbstub = { version = "0.7.5", optional = true }
 gdbstub_arch = { version = "0.3.1", optional = true }
 kvm-bindings = { version = "0.11.1", features = ["fam-wrappers", "serde"] }
 kvm-ioctls = "0.21.0"
-libc = "0.2.171"
+libc = "0.2.172"
 linux-loader = "0.13.0"
 log = { version = "0.4.27", features = ["std", "serde"] }
 log-instrument = { path = "../log-instrument", optional = true }
diff --git a/src/vmm/src/rate_limiter/mod.rs b/src/vmm/src/rate_limiter/mod.rs
@@ -774,6 +774,13 @@ pub(crate) mod tests {
 
     use super::*;
 
+    // Define custom refill interval to be a bit bigger. This will help
+    // in tests which wait for a limiter refill in 2 stages. This will make it so
+    // second wait will always result in the limiter being refilled. Otherwise
+    // there is a chance for a race condition between limiter refilling and limiter
+    // checking.
+    const TEST_REFILL_TIMER_INTERVAL_MS: u64 = REFILL_TIMER_INTERVAL_MS + 10;
+
     impl TokenBucket {
         // Resets the token bucket: budget set to max capacity and last-updated set to now.
         fn reset(&mut self) {
@@ -1009,11 +1016,11 @@ pub(crate) mod tests {
         // since consume failed, limiter should be blocked now
         assert!(l.is_blocked());
         // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // limiter should still be blocked
         assert!(l.is_blocked());
         // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // the timer_fd should have an event on it by now
         l.event_handler().unwrap();
         // limiter should now be unblocked
@@ -1042,11 +1049,11 @@ pub(crate) mod tests {
         // since consume failed, limiter should be blocked now
         assert!(l.is_blocked());
         // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // limiter should still be blocked
         assert!(l.is_blocked());
         // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // the timer_fd should have an event on it by now
         l.event_handler().unwrap();
         // limiter should now be unblocked
@@ -1076,11 +1083,11 @@ pub(crate) mod tests {
         // since consume failed, limiter should be blocked now
         assert!(l.is_blocked());
         // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // limiter should still be blocked
         assert!(l.is_blocked());
         // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
+        thread::sleep(Duration::from_millis(TEST_REFILL_TIMER_INTERVAL_MS / 2));
         // the timer_fd should have an event on it by now
         l.event_handler().unwrap();
         // limiter should now be unblocked
diff --git a/tests/README.md b/tests/README.md
@@ -198,7 +198,7 @@ branch and the `HEAD` of your current branch, run
 ```sh
 tools/devtool -y build --rev main --release
 tools/devtool -y build --rev HEAD --release
-tools/devtool -y test --ab -- run build/main build/HEAD --test integration_tests/performance/test_boottime.py::test_boottime
+tools/devtool -y test --no-build --ab -- run build/main build/HEAD --test integration_tests/performance/test_boottime.py::test_boottime
 ```
 
 #### How to Write an A/B-Compatible Test and Common Pitfalls
diff --git a/tests/framework/utils.py b/tests/framework/utils.py
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 """Generic utility functions that are used in the framework."""
 import errno
-import functools
 import json
 import logging
 import os
@@ -15,7 +14,6 @@
 import typing
 from collections import defaultdict, namedtuple
 from contextlib import contextmanager
-from pathlib import Path
 from typing import Dict
 
 import packaging.version
@@ -162,72 +160,14 @@ def _cpus(cls):
 
         See this issue for details:
         https://github.com/moby/moby/issues/20770.
-        """
-        # The real processor map is found at different paths based on cgroups version:
-        #  - cgroupsv1: /cpuset.cpus
-        #  - cgroupsv2: /cpuset.cpus.effective
-        # For more details, see https://docs.kernel.org/admin-guide/cgroup-v2.html#cpuset-interface-files
-        for path in [
-            Path("/sys/fs/cgroup/cpuset/cpuset.cpus"),
-            Path("/sys/fs/cgroup/cpuset.cpus.effective"),
-        ]:
-            if path.exists():
-                return ListFormatParser(path.read_text("ascii").strip()).parse()
-
-        raise RuntimeError("Could not find cgroups cpuset")
-
-
-class ListFormatParser:
-    """Parser class for LIST FORMAT strings."""
-
-    def __init__(self, content):
-        """Initialize the parser with the content."""
-        self._content = content.strip()
-
-    @classmethod
-    def _is_range(cls, rng):
-        """Return true if the parser content is a range.
-
-        E.g ranges: 0-10.
-        """
-        match = re.search("([0-9][1-9]*)-([0-9][1-9]*)", rng)
-        # Group is a singular value.
-        return match is not None
 
-    @classmethod
-    def _range_to_list(cls, rng):
-        """Return a range of integers based on the content.
-
-        The content respects the LIST FORMAT defined in the
-        cpuset documentation.
-        See: https://man7.org/linux/man-pages/man7/cpuset.7.html.
+        Note that this method is called only once when `CpuMap.arr` is
+        initialized.
         """
-        ends = rng.split("-")
-        if len(ends) != 2:
-            return []
-
-        return list(range(int(ends[0]), int(ends[1]) + 1))
-
-    def parse(self):
-        """Parse list formats for cpuset and mems.
-
-        See LIST FORMAT here:
-        https://man7.org/linux/man-pages/man7/cpuset.7.html.
-        """
-        if len(self._content) == 0:
-            return []
-
-        groups = self._content.split(",")
-        arr = set()
-
-        def func(acc, cpu):
-            if ListFormatParser._is_range(cpu):
-                acc.update(ListFormatParser._range_to_list(cpu))
-            else:
-                acc.add(int(cpu))
-            return acc
-
-        return list(functools.reduce(func, groups, arr))
+        # https://psutil.readthedocs.io/en/latest/#psutil.Process.cpu_affinity
+        # > If no argument is passed it returns the current CPU affinity as a
+        # > list of intergers.
+        return psutil.Process().cpu_affinity()
 
 
 class CmdBuilder:
diff --git a/tests/integration_tests/functional/test_balloon.py b/tests/integration_tests/functional/test_balloon.py
diff --git a/tests/integration_tests/performance/test_block_ab.py b/tests/integration_tests/performance/test_block_ab.py
diff --git a/tools/devtool b/tools/devtool
