Merge branch 'main' into dependabot/pip/tools/devctr/urllib3-2.6.0

JamesC1305 · web-flow · commit c9505942deb7 · 2025-12-10T14:24:15.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -18,7 +18,7 @@ syn = { version = "2.0.111", features = ["full", "extra-traits", "visit", "visit
 walkdir = "2.5.0"
 
 [dev-dependencies]
-uuid = { version = "1.18.1", features = ["v4"] }
+uuid = { version = "1.19.0", features = ["v4"] }
 
 [lints]
 workspace = true
diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -15,7 +15,7 @@ tracing = ["log-instrument", "vmm/tracing"]
 [dependencies]
 clap = { version = "4.5.53", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -22,7 +22,7 @@ gdb = ["vmm/gdb"]
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.2"
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 serde = { version = "1.0.228", features = ["derive"] }
@@ -40,7 +40,7 @@ serde_json = "1.0.145"
 
 [dev-dependencies]
 cargo_toml = "0.22.3"
-libc = "0.2.177"
+libc = "0.2.178"
 regex = { version = "1.12.2", default-features = false, features = [
   "std",
   "unicode-perl",
diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -15,7 +15,7 @@ bench = false
 tracing = ["log-instrument", "utils/tracing"]
 
 [dependencies]
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 regex = { version = "1.12.2", default-features = false, features = ["std"] }
 thiserror = "2.0.17"
diff --git a/src/log-instrument/Cargo.toml b/src/log-instrument/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 bench = false
 
 [dependencies]
-log = "0.4.28"
+log = "0.4.29"
 log-instrument-macros = { path = "../log-instrument-macros" }
 
 [dev-dependencies]
diff --git a/src/pci/Cargo.toml b/src/pci/Cargo.toml
@@ -14,8 +14,8 @@ default = []
 [dependencies]
 
 displaydoc = "0.2.5"
-libc = "0.2.177"
-log = "0.4.28"
+libc = "0.2.178"
+log = "0.4.29"
 serde = { version = "1.0.228", features = ["derive"] }
 thiserror = "2.0.17"
 
diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -14,7 +14,7 @@ tracing = ["log-instrument", "utils/tracing"]
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.17"
 vmm-sys-util = "0.15.0"
diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -19,7 +19,7 @@ bench = false
 bincode = { version = "2.0.1", features = ["serde"] }
 clap = { version = "4.5.53", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.177"
+libc = "0.2.178"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 thiserror = "2.0.17"
diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -17,7 +17,7 @@ clap = { version = "4.5.53", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.27"
 thiserror = "2.0.17"
diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -13,7 +13,7 @@ tracing = ["log-instrument"]
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.177"
+libc = "0.2.178"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.17"
 
diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -24,7 +24,7 @@ bitflags = "2.10.0"
 bitvec = { version = "1.0.1", features = ["atomic", "serde"] }
 byteorder = "1.5.0"
 crc64 = "2.0.0"
-derive_more = { version = "2.0.1", default-features = false, features = [
+derive_more = { version = "2.1.0", default-features = false, features = [
   "from",
   "display",
 ] }
@@ -34,9 +34,9 @@ gdbstub = { version = "0.7.8", optional = true }
 gdbstub_arch = { version = "0.3.2", optional = true }
 kvm-bindings = { version = "0.14.0", features = ["fam-wrappers", "serde"] }
 kvm-ioctls = "0.24.0"
-libc = "0.2.177"
+libc = "0.2.178"
 linux-loader = "0.13.2"
-log = { version = "0.4.28", features = ["std", "serde"] }
+log = { version = "0.4.29", features = ["std", "serde"] }
 log-instrument = { path = "../log-instrument", optional = true }
 memfd = "0.6.5"
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
@@ -48,7 +48,7 @@ slab = "0.4.11"
 thiserror = "2.0.17"
 userfaultfd = "0.9.0"
 utils = { path = "../utils" }
-uuid = "1.18.1"
+uuid = "1.19.0"
 vhost = { version = "0.15.0", features = ["vhost-user-frontend"] }
 vm-allocator = { version = "0.1.3", features = ["serde"] }
 vm-memory = { version = "0.17.1", features = [
@@ -63,7 +63,7 @@ zerocopy = { version = "0.8.31" }
 vm-fdt = "0.3.0"
 
 [dev-dependencies]
-criterion = { version = "0.8.0", default-features = false }
+criterion = { version = "0.8.1", default-features = false }
 device_tree = "1.1.0"
 itertools = "0.14.0"
 proptest = { version = "1.9.0", default-features = false, features = ["std"] }
diff --git a/tests/framework/utils_cpuid.py b/tests/framework/utils_cpuid.py
@@ -32,13 +32,15 @@ class CpuModel(str, Enum):
     INTEL_CASCADELAKE = "INTEL_CASCADELAKE"
     INTEL_ICELAKE = "INTEL_ICELAKE"
     INTEL_SAPPHIRE_RAPIDS = "INTEL_SAPPHIRE_RAPIDS"
+    INTEL_GRANITE_RAPIDS = "INTEL_GRANITE_RAPIDS"
 
 
 CPU_DICT = {
     CpuVendor.INTEL: {
         "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
         "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
         "Intel(R) Xeon(R) Platinum 8488C": "INTEL_SAPPHIRE_RAPIDS",
+        "Intel(R) Xeon(R) 6975P-C": "INTEL_GRANITE_RAPIDS",
     },
     CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
     CpuVendor.ARM: {
diff --git a/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py b/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py
@@ -238,8 +238,7 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
             else:
                 assert host_feats - guest_feats == host_guest_diff_6_1
             assert guest_feats - host_feats == INTEL_GUEST_ONLY_FEATS - {"umip"}
-
-        case CpuModel.INTEL_SAPPHIRE_RAPIDS:
+        case CpuModel.INTEL_SAPPHIRE_RAPIDS | CpuModel.INTEL_GRANITE_RAPIDS:
             expected_host_minus_guest = INTEL_HOST_ONLY_FEATS.copy()
             expected_guest_minus_host = INTEL_GUEST_ONLY_FEATS.copy()
 
@@ -275,25 +274,32 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
                 # L3 variants are listed in INTEL_HOST_ONLY_FEATS.
                 "cat_l2",
                 "cdp_l2",
-                # This is a synthesized bit for split lock detection that raise an Alignment Check
-                # (#AC) exception if an operand of an atomic operation crosses two cache lines. It
-                # is not enumerated on CPUID, instead detected by actually attempting to read from
-                # MSR address 0x33 (MSR_MEMORY_CTRL in Intel SDM, MSR_TEST_CTRL in Linux kernel).
-                "split_lock_detect",
                 # Firecracker disables WAITPKG in CPUID normalization.
                 # https://github.com/firecracker-microvm/firecracker/pull/5118
                 "waitpkg",
             }
 
+            # FIX: Split lock detection should be enabled on Granite Rapids too. This is a temporary patch
+            # to prevent recurrent, known test failures. Once addressed, split lock detection will be enabled
+            # on both Sapphire and Granite Rapids.
+            if CPU_MODEL == CpuModel.INTEL_SAPPHIRE_RAPIDS:
+                # This is a synthesized bit for split lock detection that raise an Alignment Check
+                # (#AC) exception if an operand of an atomic operation crosses two cache lines. It
+                # is not enumerated on CPUID, instead detected by actually attempting to read from
+                # MSR address 0x33 (MSR_MEMORY_CTRL in Intel SDM, MSR_TEST_CTRL in Linux kernel).
+                expected_host_minus_guest |= {"split_lock_detect"}
+
+            elif CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
+                # VMScape mitigation. Granite Rapids CPUs are not affected, and therefore do not need
+                # this feature.
+                expected_host_minus_guest -= {
+                    "ibpb_exit_to_user",
+                }
+
             # The following features are also not virtualized by KVM yet but are only supported on
             # newer kernel versions.
             if host_version >= (5, 18):
                 expected_host_minus_guest |= {
-                    # Hardware Feedback Interface (HFI) is a feature that gives OSes a performance
-                    # and energy efficiency capability data for each CPU that can be used to
-                    # influence task placement decisions.
-                    # https://github.com/torvalds/linux/commit/7b8f40b3de75c971a4e5f9308b06deb59118dbac
-                    "hfi",
                     # Indirect Brach Tracking (IBT) is a feature where the CPU ensures that indirect
                     # branch targets start with ENDBRANCH instruction (`endbr32` or `endbr64`),
                     # which executes as a no-op; if anything else is found, a control-protection
@@ -302,6 +308,25 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
                     "ibt",
                 }
 
+                if CPU_MODEL == CpuModel.INTEL_SAPPHIRE_RAPIDS:
+                    expected_host_minus_guest |= {
+                        # Hardware Feedback Interface (HFI) is a feature that gives OSes a performance
+                        # and energy efficiency capability data for each CPU that can be used to
+                        # influence task placement decisions. Only available on Sapphire Rapids.
+                        # https://github.com/torvalds/linux/commit/7b8f40b3de75c971a4e5f9308b06deb59118dbac
+                        "hfi",
+                    }
+
+            # FIX: This should also be backported to 5.10. Lower priority than split_lock_detect
+            # though.
+            elif host_version < (5, 19) and CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
+                expected_host_minus_guest -= {
+                    # From v5.19 onwards, PPIN is detected by reading MSRs. On versions before,
+                    # a static list of architectures is enumerated. As of now, Granite Rapids has
+                    # not been backported to this list, and hence PPIN is not enabled.
+                    "intel_ppin",
+                }
+
             # AVX512 FP16 is supported and passed through on v5.11+.
             # https://github.com/torvalds/linux/commit/e1b35da5e624f8b09d2e98845c2e4c84b179d9a4
             # https://github.com/torvalds/linux/commit/2224fc9efb2d6593fbfb57287e39ba4958b188ba
@@ -337,7 +362,6 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
 
             assert host_feats - guest_feats == expected_host_minus_guest
             assert guest_feats - host_feats == expected_guest_minus_host
-
         case CpuModel.ARM_NEOVERSE_N1:
             expected_guest_minus_host = set()
             expected_host_minus_guest = set()
