Merge branch 'main' into tests-netns-reuse

Author: pb8o

docs/snapshotting/snapshot-support.md

@@ -266,7 +266,7 @@ curl --unix-socket /tmp/firecracker.socket -i \
     -d '{
             "snapshot_type": "Full",
             "snapshot_path": "./snapshot_file",
-            "mem_file_path": "./mem_file",
+            "mem_file_path": "./mem_file"
     }'
 ```
 

src/vmm/src/devices/virtio/vsock/packet.rs

@@ -518,7 +518,7 @@ mod tests {
             ))
         }
 
-        // Test case: the buffer descriptor cannot fit all the data advertised by the the
+        // Test case: the buffer descriptor cannot fit all the data advertised by the
         // packet header `len` field.
         {
             create_context!(test_ctx, handler_ctx);

src/vmm/src/dumbo/tcp/connection.rs

@@ -815,7 +815,7 @@ impl Connection {
     /// * `mss_reserved` - How much (if anything) of the MSS value has been already used at the
     ///   lower layers (by IP options, for example). This will be zero most of the time.
     /// * `payload_src` - References a buffer which contains data to send, and also specifies the
-    ///   sequence number associated with the first byte from that that buffer.
+    ///   sequence number associated with the first byte from that buffer.
     /// * `now` - An opaque timestamp representing the current moment in time.
     ///
     /// [`MAX_WINDOW_SIZE`]: ../constant.MAX_WINDOW_SIZE.html

tests/integration_tests/build/test_seccomp_no_redundant_rules.py

@@ -5,8 +5,6 @@
 import platform
 from pathlib import Path
 
-import pytest
-
 from framework import utils
 from framework.static_analysis import (
     determine_unneeded_seccomp_rules,
@@ -15,10 +13,6 @@
 )
 
 
-@pytest.mark.skipif(
-    platform.machine() != "x86_64",
-    reason="aarch64 nightly toolchain does not support flags needed to compile analyzable binary yet",
-)
 def test_redundant_seccomp_rules():
     """Test that fails if static analysis determines redundant seccomp rules"""
     arch = platform.processor()

tools/devctr/Dockerfile

@@ -113,7 +113,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-too
     && rustup target add x86_64-unknown-linux-musl \
     && rustup target add aarch64-unknown-linux-musl \
     && rustup component add llvm-tools-preview clippy rustfmt \
-    && cargo install --locked cargo-audit cargo-deny@0.16.1 grcov cargo-sort cargo-afl \
+    && cargo install --locked cargo-audit cargo-deny grcov cargo-sort cargo-afl \
     && cargo install --locked kani-verifier && cargo kani setup \
     \
     && NIGHTLY_TOOLCHAIN=$(rustup toolchain list | grep nightly | tr -d '\n') \
@@ -149,12 +149,18 @@ RUN cd /usr/include/$ARCH-linux-musl \
     && ln -s ../asm-generic asm-generic
 
 # Install static version of libseccomp
-#
+# We need to compile from source because 
+# libseccomp provided by the distribution is not
+# compiled with musl-gcc and we need this
+# for our musl builds.
+# We specify the tag in order to have a fixed version
+# of the library.
 RUN apt-get update \
     && apt-get -y install \
         libtool gperf \
     && git clone https://github.com/seccomp/libseccomp /tmp/libseccomp \
     && cd /tmp/libseccomp \
+    && git checkout tags/v2.5.5 \
     && ./autogen.sh \
     && CC="musl-gcc -static" ./configure --enable-static=yes --enable-shared=false \
     && make install \

tools/devtool

@@ -68,7 +68,7 @@
 DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"
 
 # Development container tag
-DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v76}
+DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v77}
 
 # Development container image (name:tag)
 # This should be updated whenever we upgrade the development container.