Skip to content

Commit 241e63a

Browse files
authored
Merge branch 'main' into test-seccomp
2 parents 08fff1a + d7734e2 commit 241e63a

38 files changed

+740
-1206
lines changed

.buildkite/pipeline_perf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
pins = {
125125
# TODO: Unpin when performance instability on m6i/5.10 has gone.
126126
"linux_5.10-pinned": {"instance": "m6i.metal", "kv": "linux_5.10"},
127+
# TODO: Unpin when performance instability on m6i/6.1 has gone.
128+
"linux_6.1-pinned": {"instance": "m6i.metal", "kv": "linux_6.1"},
127129
}
128130

129131

Cargo.lock

Lines changed: 38 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/getting-started.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,16 @@ sudo ip link set dev "$TAP_DEV" up
197197

198198
# Enable ip forwarding
199199
sudo sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"
200+
sudo iptables -P FORWARD ACCEPT
200201

201-
HOST_IFACE="eth0"
202+
# This tries to determine the name of the host network interface to forward
203+
# VM's outbound network traffic through. If outbound traffic doesn't work,
204+
# double check this returns the correct interface!
205+
HOST_IFACE=$(ip -j route list default |jq -r '.[0].dev')
202206

203207
# Set up microVM internet access
204208
sudo iptables -t nat -D POSTROUTING -o "$HOST_IFACE" -j MASQUERADE || true
205-
sudo iptables -D FORWARD -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT \
206-
|| true
207-
sudo iptables -D FORWARD -i "$TAP_DEV" -o "$HOST_IFACE" -j ACCEPT || true
208209
sudo iptables -t nat -A POSTROUTING -o "$HOST_IFACE" -j MASQUERADE
209-
sudo iptables -I FORWARD 1 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
210-
sudo iptables -I FORWARD 1 -i "$TAP_DEV" -o "$HOST_IFACE" -j ACCEPT
211210

212211
API_SOCKET="/tmp/firecracker.socket"
213212
LOGFILE="./firecracker.log"

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "Apache-2.0"
1010
displaydoc = "0.2.5"
1111
thiserror = "2.0.3"
1212
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
13-
zerocopy = { version = "0.8.10", features = ["derive"] }
13+
zerocopy = { version = "0.8.11", features = ["derive"] }
1414

1515
[lib]
1616
bench = false

src/clippy-tracing/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ bench = false
1212
[dependencies]
1313
clap = { version = "4.5.21", features = ["derive"] }
1414
itertools = "0.13.0"
15-
proc-macro2 = { version = "1.0.89", features = ["span-locations"] }
15+
proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
1616
quote = "1.0.37"
17-
syn = { version = "2.0.85", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
17+
syn = { version = "2.0.90", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]

src/cpu-template-helper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bench = false
1212
[dependencies]
1313
clap = { version = "4.5.21", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
15-
libc = "0.2.164"
15+
libc = "0.2.167"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
serde = { version = "1.0.215", features = ["derive"] }
1818
serde_json = "1.0.133"

src/firecracker/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bench = false
1818
[dependencies]
1919
displaydoc = "0.2.5"
2020
event-manager = "0.4.0"
21-
libc = "0.2.164"
21+
libc = "0.2.167"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

@@ -34,7 +34,7 @@ vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
3434

3535
[dev-dependencies]
3636
cargo_toml = "0.20.5"
37-
libc = "0.2.164"
37+
libc = "0.2.167"
3838
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
3939

4040
# Dev-Dependencies for uffd examples

src/jailer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name = "jailer"
1212
bench = false
1313

1414
[dependencies]
15-
libc = "0.2.164"
15+
libc = "0.2.167"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
nix = { version = "0.29.0", default-features = false, features = ["dir"] }
1818
regex = { version = "1.11.1", default-features = false, features = ["std"] }

src/log-instrument-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ proc-macro = true
1111
bench = false
1212

1313
[dependencies]
14-
proc-macro2 = "1.0.89"
14+
proc-macro2 = "1.0.92"
1515
quote = "1.0.37"
16-
syn = { version = "2.0.85", features = ["full", "extra-traits"] }
16+
syn = { version = "2.0.90", features = ["full", "extra-traits"] }
1717

1818
[lints]
1919
workspace = true

src/rebase-snap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bench = false
1111

1212
[dependencies]
1313
displaydoc = "0.2.5"
14-
libc = "0.2.164"
14+
libc = "0.2.167"
1515
log-instrument = { path = "../log-instrument", optional = true }
1616
thiserror = "2.0.3"
1717
vmm-sys-util = "0.12.1"

0 commit comments

Comments
 (0)