Merge branch 'main' into fix-devtool-install

firecracker-microvm · Nov 12, 2024 · 7fc67c9 · 7fc67c9
2 parents fddf4f0 + 79bf129
commit 7fc67c9
Show file tree

Hide file tree

Showing 21 changed files with 479 additions and 104 deletions.
diff --git a/.buildkite/pipeline_cpu_template.py b/.buildkite/pipeline_cpu_template.py
@@ -23,7 +23,7 @@ class BkStep(str, Enum):
 cpu_template_test = {
     "rdmsr": {
         BkStep.COMMAND: [
-            "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features.py -k 'test_cpu_rdmsr' "
+            "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features_x86_64.py -k 'test_cpu_rdmsr' "
         ],
         BkStep.LABEL: "📖 rdmsr",
         "instances": ["c5n.metal", "m5n.metal", "m6a.metal", "m6i.metal"],
@@ -40,7 +40,7 @@ class BkStep(str, Enum):
     "cpuid_wrmsr": {
         "snapshot": {
             BkStep.COMMAND: [
-                "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features.py -k 'test_cpu_wrmsr_snapshot or test_cpu_cpuid_snapshot'",
+                "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features_x86_64.py -k 'test_cpu_wrmsr_snapshot or test_cpu_cpuid_snapshot'",
                 "mkdir -pv tests/snapshot_artifacts_upload/{instance}_{os}_{kv}",
                 "sudo mv tests/snapshot_artifacts/* tests/snapshot_artifacts_upload/{instance}_{os}_{kv}",
             ],
@@ -52,7 +52,7 @@ class BkStep(str, Enum):
             BkStep.COMMAND: [
                 "buildkite-agent artifact download tests/snapshot_artifacts_upload/{instance}_{os}_{kv}/**/* .",
                 "mv tests/snapshot_artifacts_upload/{instance}_{os}_{kv} tests/snapshot_artifacts",
-                "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features.py -k 'test_cpu_wrmsr_restore or test_cpu_cpuid_restore'",
+                "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features_x86_64.py -k 'test_cpu_wrmsr_restore or test_cpu_cpuid_restore'",
             ],
             BkStep.LABEL: "📸 load snapshot artifacts created on {instance} {snapshot_os} {snapshot_kv} to {restore_instance} {restore_os} {restore_kv}",
             BkStep.TIMEOUT: 30,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,18 @@ and this project adheres to
 
 ### Added
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+## \[1.10.0\]
+
+### Added
+
 - [#4834](https://github.com/firecracker-microvm/firecracker/pull/4834): Add
   `VIRTIO_NET_F_RX_MRGBUF` support to the `virtio-net` device. When this feature
   is negotiated, guest `virtio-net` driver can perform more efficient memory
@@ -33,10 +45,6 @@ and this project adheres to
 
 ### Changed
 
-- [#4875](https://github.com/firecracker-microvm/firecracker/pull/4875):
-  Increase default queue size for the `virtio-net` device from 256 to 512. This
-  decreases wait time between guest and vmm threads for network packets
-  processing and allows for more throughput.
 - [#4844](https://github.com/firecracker-microvm/firecracker/pull/4844): Upgrade
   `virtio-net` device to use `readv` syscall to avoid unnecessary memory copies
   on RX path, increasing the RX performance.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/RELEASE_POLICY.md b/docs/RELEASE_POLICY.md
@@ -90,9 +90,10 @@ v3.1 will be patched since were the last two Firecracker releases and less than
 
 | Release | Release Date | Latest Patch | Min. end of support | Official end of Support         |
 | ------: | -----------: | -----------: | ------------------: | :------------------------------ |
+|   v1.10 |   2024-11-07 |      v1.10.0 |          2025-05-07 | Supported                       |
 |    v1.9 |   2024-09-02 |       v1.9.1 |          2025-03-02 | Supported                       |
 |    v1.8 |   2024-07-10 |       v1.8.0 |          2025-01-10 | Supported                       |
-|    v1.7 |   2024-03-18 |       v1.7.0 |          2024-09-18 | Supported                       |
+|    v1.7 |   2024-03-18 |       v1.7.0 |          2024-09-18 | 2024-09-18 (end of 6mo support) |
 |    v1.6 |   2023-12-20 |       v1.6.0 |          2024-06-20 | 2024-07-10 (v1.8 released)      |
 |    v1.5 |   2023-10-09 |       v1.5.1 |          2024-04-09 | 2024-04-09 (end of 6mo support) |
 |    v1.4 |   2023-07-20 |       v1.4.1 |          2024-01-20 | 2024-01-20 (end of 6mo support) |

diff --git a/src/acpi-tables/Cargo.toml b/src/acpi-tables/Cargo.toml
@@ -8,9 +8,9 @@ license = "Apache-2.0"
 
 [dependencies]
 displaydoc = "0.2.5"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-bitmap"] }
-zerocopy = { version = "0.8.7", features = ["derive"] }
+zerocopy = { version = "0.8.8", features = ["derive"] }
 
 [lib]
 bench = false

diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cpu-template-helper"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.132"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"

diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "firecracker"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -26,7 +26,7 @@ seccompiler = { path = "../seccompiler" }
 serde = { version = "1.0.214", features = ["derive"] }
 serde_derive = "1.0.136"
 serde_json = "1.0.132"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 timerfd = "1.6.0"
 utils = { path = "../utils" }
 vmm = { path = "../vmm" }

diff --git a/src/firecracker/swagger/firecracker.yaml b/src/firecracker/swagger/firecracker.yaml
@@ -5,7 +5,7 @@ info:
     The API is accessible through HTTP calls on specific URLs
     carrying JSON modeled data.
     The transport medium is a Unix Domain Socket.
-  version: 1.10.0-dev
+  version: 1.11.0-dev
   termsOfService: ""
   contact:
     email: "[email protected]"

diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jailer"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 description = "Process for starting Firecracker in production scenarios; applies a cgroup/namespace isolation barrier and then drops privileges."
@@ -16,7 +16,7 @@ libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
 nix = { version = "0.29.0", default-features = false, features = ["dir"] }
 regex = { version = "1.11.1", default-features = false, features = ["std"] }
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }

diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rebase-snap"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ bench = false
 displaydoc = "0.2.5"
 libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }

diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "seccompiler"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 description = "Program that compiles multi-threaded seccomp-bpf filters expressed as JSON into raw BPF programs, serializing them and outputting them to a file."
@@ -22,7 +22,7 @@ libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.132"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 
 utils = { path = "../utils" }