Merge branch 'main' into main

firecracker-microvm · Nov 7, 2024 · e355db6 · e355db6
2 parents 22434e5 + 0614ed7
commit e355db6
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,10 +33,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
@@ -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
@@ -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/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -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
@@ -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
@@ -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" }
 

diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -17,7 +17,7 @@ fc_utils = { package = "utils", path = "../utils" }
 libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.23"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"
 

diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -14,7 +14,7 @@ displaydoc = "0.2.5"
 libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.214", features = ["derive"] }
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-bitmap"] }
 vmm-sys-util = "0.12.1"
 

diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -37,16 +37,16 @@ semver = { version = "1.0.23", features = ["serde"] }
 serde = { version = "1.0.214", features = ["derive", "rc"] }
 serde_json = "1.0.132"
 slab = "0.4.7"
-thiserror = "1.0.65"
+thiserror = "1.0.67"
 timerfd = "1.5.0"
 userfaultfd = "0.8.1"
 utils = { path = "../utils" }
-vhost = { version = "0.12.1", features = ["vhost-user-frontend"] }
+vhost = { version = "0.13.0", features = ["vhost-user-frontend"] }
 vm-allocator = "0.1.0"
 vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-bitmap"] }
 vm-superio = "0.8.0"
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
-zerocopy = { version = "0.8.7" }
+zerocopy = { version = "0.8.8" }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 vm-fdt = "0.3.0"

diff --git a/src/vmm/src/devices/virtio/net/mod.rs b/src/vmm/src/devices/virtio/net/mod.rs
@@ -6,7 +6,7 @@
 use std::io;
 
 /// Maximum size of the queue for network device.
-pub const NET_QUEUE_MAX_SIZE: u16 = 512;
+pub const NET_QUEUE_MAX_SIZE: u16 = 256;
 /// Maximum size of the frame buffers handled by this device.
 pub const MAX_BUFFER_SIZE: usize = 65562;
 /// The number of queues of the network device.