devtool: added strip command

Added `devtool strip` command. This command can strip binaries out of
DWARF debug sections. The command can be parameterized by
`--target-libc (musl|gnu)`, which sets the libc used by a specific
toolchain (e.g. x86_64-uknown-linux-${libc_flavor}).

Signed-off-by: Iulian Barbu <[email protected]>

Author: Iulian Barbu

CHANGELOG.md

@@ -25,6 +25,7 @@
   snapshot.
 - Added a new API call, `PUT /snapshot/load`, for loading a snapshot.
 - Added metrics for the vsock device.
+- Added devtool strip command to strip release binaries out of DWARF sections.
 
 ### Fixed
 

tests/host_tools/cargo_build.py

@@ -69,12 +69,15 @@ def get_firecracker_binaries():
     fc_bin_path = "{}/{}".format(out_dir, FC_BINARY_NAME)
     jailer_bin_path = "{}/{}".format(out_dir, JAILER_BINARY_NAME)
 
+    cmd = "strip --strip-debug {} {}".format(fc_bin_path, jailer_bin_path)
+    utils.run_cmd(cmd)
+
     return fc_bin_path, jailer_bin_path
 
 
 def get_rustflags():
     """Get the relevant rustflags for building/unit testing."""
     rustflags = "-D warnings"
     if platform.machine() == "aarch64":
-        rustflags += " -C link-arg=-lgcc -C link-arg=-lfdt "
+        rustflags += " -C link-args=-lgcc -lfdt "
     return rustflags

tests/integration_tests/build/test_binary_size.py

@@ -11,16 +11,16 @@
 MACHINE = platform.machine()
 """ Platform definition used to select the correct size target"""
 
-FC_BINARY_SIZE_TARGET = 3200000 if MACHINE == "x86_64" else 3251464
+FC_BINARY_SIZE_TARGET = 1955168 if MACHINE == "x86_64" else 1531384
 """Firecracker target binary size in bytes"""
 
-FC_BINARY_SIZE_LIMIT = 3500000 if MACHINE == "x86_64" else 3400000
+FC_BINARY_SIZE_LIMIT = 2052927 if MACHINE == "x86_64" else 1607953
 """Firecracker maximum binary size in bytes"""
 
-JAILER_BINARY_SIZE_TARGET = 2568384 if MACHINE == "x86_64" else 2792688
+JAILER_BINARY_SIZE_TARGET = 1439512 if MACHINE == "x86_64" else 1338312
 """Jailer target binary size in bytes"""
 
-JAILER_BINARY_SIZE_LIMIT = 3000000
+JAILER_BINARY_SIZE_LIMIT = 1511488
 """Jailer maximum binary size in bytes"""
 
 BINARY_SIZE_TOLERANCE = 0.05

tools/devtool

@@ -385,6 +385,15 @@ cmd_help() {
     echo "        -l, --libc musl|gnu   Choose the libc flavor against which Firecracker will"
     echo "                              be linked. Default is musl."
     echo ""
+    echo "    strip [--target-libc musl|gnu]"
+    echo "        Strip from debug symbols the Firecracker binaries."
+    echo ""
+    echo "        --target-libc musl|gnu   Choose the target libc flavor which determines the"
+    echo "                                 toolchain used to build Firecracker release binaries."
+    echo "                                 Stripping will occur only for the Firecracker release"
+    echo "                                 binaries corresponding to the inferred toolchain. Default"
+    echo "                                 is musl."
+    echo ""
     echo "    fmt"
     echo "        Auto-format all Rust source files, to match the Firecracker requirements."
     echo "        This should be used as the last step in every commit, to ensure that the"
@@ -500,6 +509,54 @@ cmd_build() {
     return $ret
 }
 
+cmd_strip() {
+    profile="release"
+    libc="musl"
+    target="$(uname -m)-unknown-linux-${libc}"
+
+    # Parse any command line args.
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            "-h"|"--help")  { cmd_help; exit 1;     } ;;
+            "--target-libc")
+                shift
+                [[ "$1" =~ ^(musl|gnu)$ ]] || \
+                    die "Invalid libc: $1. Valid options are \"musl\" and \"gnu\"."
+                libc="$1"
+                target="$(uname -m)-unknown-linux-${libc}"
+                ;;
+            *)
+                die "Unknown argument: $1. Please use --help for help."
+            ;;
+        esac
+        shift
+    done
+
+    # Check prerequisites
+    ensure_devctr
+    ensure_build_dir
+
+    say "Starting stripping the debug symbols for $profile binaries built against $target target."
+    strip_flags="--strip-debug"
+    say "Strip flags: $strip_flags."
+
+    run_devctr \
+      --user "$(id -u):$(id -g)" \
+      -- \
+      strip $strip_flags\
+        "$CTR_CARGO_TARGET_DIR/$target/$profile/firecracker" \
+        "$CTR_CARGO_TARGET_DIR/$target/$profile/jailer"
+    ret=$?
+
+    [ $ret -eq 0 ] && {
+        cargo_bin_dir="$CARGO_TARGET_DIR/$target/$profile"
+        say "Stripping was successful."
+        say "Stripped binaries placed under $cargo_bin_dir."
+    }
+
+    return $?
+}
+
 # `$0 test` - run integration tests
 # Please see `$0 help` for more information.
 #