From 36b7a486c9388efd4989dd1b2e6ec969db4d25d5 Mon Sep 17 00:00:00 2001
From: kyechou <kuanyenchou@gmail.com>
Date: Fri, 10 Nov 2023 10:24:27 -0600
Subject: [PATCH] Update scripts to build Klint NF container images

---
 Dockerfiles/Makefile                  |  1 +
 Dockerfiles/dpdk/Dockerfile           | 28 ++++++++++
 Dockerfiles/dpdk/build-dpdk.sh        | 78 +++++++++++++++++++++++++++
 Dockerfiles/klint-bridge/Dockerfile   |  2 +-
 Dockerfiles/klint-firewall/Dockerfile |  2 +-
 Dockerfiles/klint-maglev/Dockerfile   |  2 +-
 Dockerfiles/klint-nat/Dockerfile      |  2 +-
 Dockerfiles/klint-policer/Dockerfile  |  2 +-
 scripts/build-klint-nfs.sh            | 11 ++--
 9 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 Dockerfiles/dpdk/Dockerfile
 create mode 100755 Dockerfiles/dpdk/build-dpdk.sh

diff --git a/Dockerfiles/Makefile b/Dockerfiles/Makefile
index 62da59e1..6967c644 100644
--- a/Dockerfiles/Makefile
+++ b/Dockerfiles/Makefile
@@ -1,6 +1,7 @@
 TARGETS = \
 	iptables \
 	ipvs \
+	dpdk \
 	klint-bridge \
 	klint-firewall \
 	klint-maglev \
diff --git a/Dockerfiles/dpdk/Dockerfile b/Dockerfiles/dpdk/Dockerfile
new file mode 100644
index 00000000..3e8f1508
--- /dev/null
+++ b/Dockerfiles/dpdk/Dockerfile
@@ -0,0 +1,28 @@
+FROM ubuntu:22.04
+
+LABEL org.opencontainers.image.authors="kychou2@illinois.edu"
+LABEL RUN docker run -it --privileged \
+    -v /sys/bus/pci/devices:/sys/bus/pci/devices \
+    -v /sys/bus/pci/drivers:/sys/bus/pci/drivers \
+    -v /sys/kernel/mm/hugepages:/sys/kernel/mm/hugepages \
+    -v /sys/devices/system/node:/sys/devices/system/node \
+    -v /dev:/dev \
+    --name NAME \
+    IMAGE
+
+# Build and run-time dependencies for DPDK
+# https://doc.dpdk.org/guides/linux_gsg/sys_reqs.html#compilation-of-the-dpdk
+RUN apt-get update && \
+    apt-get install -y build-essential python3 meson ninja-build \
+        python3-pyelftools libnuma-dev libarchive-dev libelf-dev \
+        libhugetlbfs-dev libpcap-dev curl gcc xz-utils iproute2 make bash \
+        pciutils kmod && \
+    apt-get clean
+
+# Build DPDK
+COPY build-dpdk.sh /
+RUN /build-dpdk.sh
+
+ENV PATH "$PATH:/dpdk/build/app"
+
+ENTRYPOINT ["/bin/bash"]
diff --git a/Dockerfiles/dpdk/build-dpdk.sh b/Dockerfiles/dpdk/build-dpdk.sh
new file mode 100755
index 00000000..9b922d07
--- /dev/null
+++ b/Dockerfiles/dpdk/build-dpdk.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+# This script should be run within a container.
+
+set -euo pipefail
+
+msg() {
+    echo -e "[+] ${1-}" >&2
+}
+
+die() {
+    echo -e "[!] ${1-}" >&2
+    exit 1
+}
+
+check_depends() {
+    for cmd in "$@"; do
+        if ! command -v "$cmd" >/dev/null 2>&1; then
+            die "'$cmd' not found"
+        fi
+    done
+}
+
+usage() {
+    cat <<EOF
+[!] Usage: $(basename "${BASH_SOURCE[0]}") [options]
+
+    Options:
+    -h, --help          Print this message and exit
+EOF
+}
+
+parse_params() {
+    while :; do
+        case "${1-}" in
+        -h | --help)
+            usage
+            exit
+            ;;
+        -?*) die "Unknown option: $1\n$(usage)" ;;
+        *) break ;;
+        esac
+        shift
+    done
+}
+
+main() {
+    parse_params "$@"
+    check_depends curl tar meson ninja ldconfig
+
+    VERSION=22.11.3
+    DPDK_URL="https://fast.dpdk.org/rel/dpdk-$VERSION.tar.xz"
+    DPDK_DIR="/dpdk"
+    CONFIG=x86_64-native-linuxapp-gcc
+    export CONFIG
+
+    # Download
+    cd /
+    curl -LO $DPDK_URL
+    tar xf dpdk-$VERSION.tar.xz
+    mv "/dpdk-stable-$VERSION" "$DPDK_DIR"
+
+    # Configure
+    cd "$DPDK_DIR"
+    meson setup -Dplatform=native build
+
+    # Build
+    cd "$DPDK_DIR/build"
+    ninja
+
+    # Install
+    meson install
+    ldconfig
+}
+
+main "$@"
+
+# vim: set ts=4 sw=4 et:
diff --git a/Dockerfiles/klint-bridge/Dockerfile b/Dockerfiles/klint-bridge/Dockerfile
index d32f1ce2..92406063 100644
--- a/Dockerfiles/klint-bridge/Dockerfile
+++ b/Dockerfiles/klint-bridge/Dockerfile
@@ -11,5 +11,5 @@ COPY bin /nf
 COPY home /home
 COPY *.so.* /lib/
 
-ENV LD_LIBRARY_PATH=/lib
+ENV LD_LIBRARY_PATH /lib
 ENTRYPOINT ["/nf"]
diff --git a/Dockerfiles/klint-firewall/Dockerfile b/Dockerfiles/klint-firewall/Dockerfile
index a0f42e74..0535376b 100644
--- a/Dockerfiles/klint-firewall/Dockerfile
+++ b/Dockerfiles/klint-firewall/Dockerfile
@@ -11,5 +11,5 @@ COPY bin /nf
 COPY home /home
 COPY *.so.* /lib/
 
-ENV LD_LIBRARY_PATH=/lib
+ENV LD_LIBRARY_PATH /lib
 ENTRYPOINT ["/nf"]
diff --git a/Dockerfiles/klint-maglev/Dockerfile b/Dockerfiles/klint-maglev/Dockerfile
index 23ddf4f5..37810ee3 100644
--- a/Dockerfiles/klint-maglev/Dockerfile
+++ b/Dockerfiles/klint-maglev/Dockerfile
@@ -11,5 +11,5 @@ COPY bin /nf
 COPY home /home
 COPY *.so.* /lib/
 
-ENV LD_LIBRARY_PATH=/lib
+ENV LD_LIBRARY_PATH /lib
 ENTRYPOINT ["/nf"]
diff --git a/Dockerfiles/klint-nat/Dockerfile b/Dockerfiles/klint-nat/Dockerfile
index 7c26b237..6d5ce8fb 100644
--- a/Dockerfiles/klint-nat/Dockerfile
+++ b/Dockerfiles/klint-nat/Dockerfile
@@ -11,5 +11,5 @@ COPY bin /nf
 COPY home /home
 COPY *.so.* /lib/
 
-ENV LD_LIBRARY_PATH=/lib
+ENV LD_LIBRARY_PATH /lib
 ENTRYPOINT ["/nf"]
diff --git a/Dockerfiles/klint-policer/Dockerfile b/Dockerfiles/klint-policer/Dockerfile
index b3ea5932..4ee024e8 100644
--- a/Dockerfiles/klint-policer/Dockerfile
+++ b/Dockerfiles/klint-policer/Dockerfile
@@ -11,5 +11,5 @@ COPY bin /nf
 COPY home /home
 COPY *.so.* /lib/
 
-ENV LD_LIBRARY_PATH=/lib
+ENV LD_LIBRARY_PATH /lib
 ENTRYPOINT ["/nf"]
diff --git a/scripts/build-klint-nfs.sh b/scripts/build-klint-nfs.sh
index f01f95de..99cb692d 100755
--- a/scripts/build-klint-nfs.sh
+++ b/scripts/build-klint-nfs.sh
@@ -15,6 +15,7 @@ die() {
 
 SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+BUILD_DIR="$PROJECT_DIR/build"
 DOCKERFILES_DIR="$PROJECT_DIR/Dockerfiles"
 
 check_depends() {
@@ -54,17 +55,19 @@ main() {
 
     NFs=(bridge firewall maglev nat policer)
     KLINT_URL=https://github.com/kyechou/klint.git
-    KLINT_DIR="$SCRIPT_DIR/klint"
+    KLINT_DIR="$BUILD_DIR/klint"
 
+    mkdir -p "$BUILD_DIR"
     if [[ ! -e "$KLINT_DIR" ]]; then
         git clone --depth 1 "$KLINT_URL" "$KLINT_DIR"
     fi
-    cd "$KLINT_DIR"
 
     for NF in "${NFs[@]}"; do
         msg "Building $NF..."
-        make "build-$NF"
-        make -j -C ./env OS=linux NET=dpdk NF="$KLINT_DIR/nf/$NF/libnf.so" \
+        make -C "$KLINT_DIR" "build-$NF"
+        make -j -C "$KLINT_DIR/env" \
+            OS=linux NET=dpdk \
+            NF="$KLINT_DIR/nf/$NF/libnf.so" \
             OS_CONFIG="$KLINT_DIR/env/config" \
             NF_CONFIG="$KLINT_DIR/nf/$NF/config"
         msg "Finished building $NF"