Merge branch 'main' into 4534

.buildkite/common.py

@@ -22,8 +22,7 @@
 
 DEFAULT_PLATFORMS = [
     ("al2", "linux_4.14"),
-    # TODO: Unpin 5.10 kernel AMI once io_uring issues is solved.
-    ("al2", "linux_5.10-pinned"),
+    ("al2", "linux_5.10"),
     ("al2023", "linux_6.1"),
 ]
 

.buildkite/pipeline_cross.py

@@ -71,8 +71,7 @@ def cross_steps():
 
     # https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions
     aarch64_platforms = [
-        # TODO: unpin kernel 5.10 AMI once we fix io_uring test failures.
-        ("al2", "linux_5.10-pinned"),
+        ("al2", "linux_5.10"),
         ("al2023", "linux_6.1"),
     ]
     perms_aarch64 = itertools.product(

src/acpi-tables/Cargo.toml

@@ -10,7 +10,7 @@ license = "Apache-2.0"
 displaydoc = "0.2.4"
 thiserror = "1.0.59"
 vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
-zerocopy = { version = "0.7.32", features = ["derive"] }
+zerocopy = { version = "0.7.33", features = ["derive"] }
 
 [lib]
 bench = false

src/cpu-template-helper/Cargo.toml

@@ -14,7 +14,7 @@ clap = { version = "4.5.4", features = ["derive", "string"] }
 displaydoc = "0.2.4"
 libc = "0.2.154"
 log-instrument = { path = "../log-instrument", optional = true }
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.200", features = ["derive"] }
 serde_json = "1.0.116"
 thiserror = "1.0.59"
 

src/firecracker/Cargo.toml

@@ -23,7 +23,7 @@ log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
 seccompiler = { path = "../seccompiler" }
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.200", features = ["derive"] }
 serde_derive = "1.0.136"
 serde_json = "1.0.116"
 thiserror = "1.0.59"
@@ -37,13 +37,13 @@ libc = "0.2.154"
 regex = { version = "1.10.4", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.200", features = ["derive"] }
 userfaultfd = "0.8.1"
 
 [build-dependencies]
 bincode = "1.2.1"
 seccompiler = { path = "../seccompiler" }
-serde = { version = "1.0.199" }
+serde = { version = "1.0.200" }
 serde_json = "1.0.116"
 
 [features]

src/firecracker/src/main.rs

@@ -55,7 +55,7 @@ enum MainError {
     InvalidLogLevel(vmm::logger::LevelFilterFromStrError),
     /// Could not initialize logger: {0}
     LoggerInitialization(vmm::logger::LoggerUpdateError),
-    /// Could not initialize metrics: {0:?}
+    /// Could not initialize metrics: {0}
     MetricsInitialization(MetricsConfigError),
     /// Seccomp error: {0}
     SeccompFilter(FilterError),

src/jailer/src/main.rs

@@ -44,11 +44,11 @@ pub enum JailerError {
     CgroupInvalidParentPath(),
     #[error("Failed to write to cgroups file: {0}")]
     CgroupWrite(io::Error),
-    #[error("Failed to change owner for {0:?}: {1}")]
+    #[error("Failed to change owner for {0}: {1}")]
     ChangeFileOwner(PathBuf, io::Error),
     #[error("Failed to chdir into chroot directory: {0}")]
     ChdirNewRoot(io::Error),
-    #[error("Failed to change permissions on {0:?}: {1}")]
+    #[error("Failed to change permissions on {0}: {1}")]
     Chmod(PathBuf, io::Error),
     #[error("Failed cloning into a new child process: {0}")]
     Clone(io::Error),
@@ -112,7 +112,7 @@ pub enum JailerError {
     ReadLine(PathBuf, io::Error),
     #[error("{}", format!("Failed to read file {:?} into a string: {}", .0, .1).replace('\"', ""))]
     ReadToString(PathBuf, io::Error),
-    #[error("Regex failed: {0:?}")]
+    #[error("Regex failed: {0}")]
     RegEx(regex::Error),
     #[error("Invalid resource argument: {0}")]
     ResLimitArgument(String),

src/rebase-snap/src/main.rs

@@ -18,19 +18,19 @@ const DEPRECATION_MSG: &str = "This tool is deprecated and will be removed in th
 
 #[derive(Debug, thiserror::Error, displaydoc::Display)]
 enum FileError {
-    /// Invalid base file: {0:?}
+    /// Invalid base file: {0}
     InvalidBaseFile(std::io::Error),
-    /// Invalid diff file: {0:?}
+    /// Invalid diff file: {0}
     InvalidDiffFile(std::io::Error),
-    /// Failed to seek data: {0:?}
+    /// Failed to seek data: {0}
     SeekData(std::io::Error),
-    /// Failed to seek hole: {0:?}
+    /// Failed to seek hole: {0}
     SeekHole(std::io::Error),
-    /// Failed to seek: {0:?}
+    /// Failed to seek: {0}
     Seek(std::io::Error),
-    /// Failed to send the file: {0:?}
+    /// Failed to send the file: {0}
     SendFile(std::io::Error),
-    /// Failed to get metadata: {0:?}
+    /// Failed to get metadata: {0}
     Metadata(std::io::Error),
 }
 

src/seccompiler/Cargo.toml

@@ -20,7 +20,7 @@ bincode = "1.2.1"
 displaydoc = "0.2.4"
 libc = "0.2.154"
 log-instrument = { path = "../log-instrument", optional = true }
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.200", features = ["derive"] }
 serde_json = "1.0.116"
 thiserror = "1.0.59"
 

src/seccompiler/src/backend.rs

@@ -103,7 +103,7 @@ pub enum FilterError {
     FilterTooLarge,
     /// The seccomp rule contains an invalid argument number.
     InvalidArgumentNumber,
-    /// {0:?}
+    /// {0}
     Arch(TargetArchError),
     /// Syscall {0} has conflicting rules.
     ConflictingRules(i64),
@@ -1743,7 +1743,7 @@ mod tests {
                 "{}",
                 FilterError::Arch(TargetArchError::InvalidString("lala".to_string()))
             ),
-            format!("{:?}", TargetArchError::InvalidString("lala".to_string()))
+            format!("{0}", TargetArchError::InvalidString("lala".to_string()))
         );
     }