Merge branch 'main' into test-seccomp

firecracker-microvm · Dec 5, 2024 · 241e63a · 241e63a
2 parents 08fff1a + d7734e2
commit 241e63a
Show file tree

Hide file tree

Showing 38 changed files with 740 additions and 1,206 deletions.
diff --git a/.buildkite/pipeline_perf.py b/.buildkite/pipeline_perf.py
@@ -124,6 +124,8 @@
 pins = {
     # TODO: Unpin when performance instability on m6i/5.10 has gone.
     "linux_5.10-pinned": {"instance": "m6i.metal", "kv": "linux_5.10"},
+    # TODO: Unpin when performance instability on m6i/6.1 has gone.
+    "linux_6.1-pinned": {"instance": "m6i.metal", "kv": "linux_6.1"},
 }
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -197,17 +197,16 @@ sudo ip link set dev "$TAP_DEV" up
 
 # Enable ip forwarding
 sudo sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"
+sudo iptables -P FORWARD ACCEPT
 
-HOST_IFACE="eth0"
+# This tries to determine the name of the host network interface to forward
+# VM's outbound network traffic through. If outbound traffic doesn't work,
+# double check this returns the correct interface!
+HOST_IFACE=$(ip -j route list default |jq -r '.[0].dev')
 
 # Set up microVM internet access
 sudo iptables -t nat -D POSTROUTING -o "$HOST_IFACE" -j MASQUERADE || true
-sudo iptables -D FORWARD -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT \
-    || true
-sudo iptables -D FORWARD -i "$TAP_DEV" -o "$HOST_IFACE" -j ACCEPT || true
 sudo iptables -t nat -A POSTROUTING -o "$HOST_IFACE" -j MASQUERADE
-sudo iptables -I FORWARD 1 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-sudo iptables -I FORWARD 1 -i "$TAP_DEV" -o "$HOST_IFACE" -j ACCEPT
 
 API_SOCKET="/tmp/firecracker.socket"
 LOGFILE="./firecracker.log"

diff --git a/src/acpi-tables/Cargo.toml b/src/acpi-tables/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 displaydoc = "0.2.5"
 thiserror = "2.0.3"
 vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
-zerocopy = { version = "0.8.10", features = ["derive"] }
+zerocopy = { version = "0.8.11", features = ["derive"] }
 
 [lib]
 bench = false

diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -12,9 +12,9 @@ bench = false
 [dependencies]
 clap = { version = "4.5.21", features = ["derive"] }
 itertools = "0.13.0"
-proc-macro2 = { version = "1.0.89", features = ["span-locations"] }
+proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
 quote = "1.0.37"
-syn = { version = "2.0.85", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+syn = { version = "2.0.90", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -12,7 +12,7 @@ bench = false
 [dependencies]
 clap = { version = "4.5.21", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"

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.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
@@ -34,7 +34,7 @@ vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [dev-dependencies]
 cargo_toml = "0.20.5"
-libc = "0.2.164"
+libc = "0.2.167"
 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.164"
+libc = "0.2.167"
 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"] }

diff --git a/src/log-instrument-macros/Cargo.toml b/src/log-instrument-macros/Cargo.toml
@@ -11,9 +11,9 @@ proc-macro = true
 bench = false
 
 [dependencies]
-proc-macro2 = "1.0.89"
+proc-macro2 = "1.0.92"
 quote = "1.0.37"
-syn = { version = "2.0.85", features = ["full", "extra-traits"] }
+syn = { version = "2.0.90", features = ["full", "extra-traits"] }
 
 [lints]
 workspace = true
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.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.3"
 vmm-sys-util = "0.12.1"

diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -18,7 +18,7 @@ bench = false
 [dependencies]
 bincode = "1.2.1"
 displaydoc = "0.2.5"
-libc = "0.2.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"

diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -14,7 +14,7 @@ clap = { version = "4.5.21", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
-libc = "0.2.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.23"
 thiserror = "2.0.3"

diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -11,7 +11,7 @@ bench = false
 [dependencies]
 derive_more = { version = "1.0.0", default-features = false, features = ["from"] }
 displaydoc = "0.2.5"
-libc = "0.2.164"
+libc = "0.2.167"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
 thiserror = "2.0.3"