Per-entrypoint DevMaps

.github/buildomat/common.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Install both toolchains required for OPTE.
+# We pin to both a specific nightly *and* a stable compiler version
+# due to XDE's reliance on unstable features.
+rustup show active-toolchain || rustup toolchain install
+
+pushd xde
+rustup show active-toolchain || rustup toolchain install
+export NIGHTLY=`rustup show active-toolchain -v | head -n 1 | cut -d' ' -f1`
+popd
+
+function header {
+	echo "# ==== $* ==== #"
+}
+
+function install_pkg {
+    set +o errexit
+    pfexec pkg install $1
+    exit_code=$?
+    # 4 is the exit code returned from pkg when the package is already installed
+    if [[ $exit_code -ne 0 ]] && [[ $exit_code -ne 4 ]]; then
+        echo "package install failed for $1"
+        exit 1
+    fi
+    set -o errexit
+}

.github/buildomat/jobs/bench.sh

@@ -3,7 +3,7 @@
 #: name = "bench"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "stable"
+#: rust_toolchain = true
 #: output_rules = [
 #:   "=/work/bench-results.tgz",
 #: ]
@@ -26,6 +26,8 @@
 
 set -o xtrace
 
+source .github/buildomat/common.sh
+
 pfexec pkg install brand/sparse opte iperf demangle flamegraph
 
 if [[ -z $BUILDOMAT_JOB_ID ]]; then

.github/buildomat/jobs/opte-api.sh

@@ -3,17 +3,15 @@
 #: name = "opte-api"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = []
 #:
 
 set -o errexit
 set -o pipefail
 set -o xtrace
 
-function header {
-	echo "# ==== $* ==== #"
-}
+source .github/buildomat/common.sh
 
 cargo --version
 rustc --version
@@ -24,7 +22,7 @@ header "check API_VERSION"
 ./check-api-version.sh
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -- --check
+ptime -m cargo +$NIGHTLY fmt -- --check
 
 header "analyze std"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/opte-ioctl.sh

@@ -3,25 +3,23 @@
 #: name = "opte-ioctl"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = []
 #:
 
 set -o errexit
 set -o pipefail
 set -o xtrace
 
-function header {
-	echo "# ==== $* ==== #"
-}
+source .github/buildomat/common.sh
 
 cargo --version
 rustc --version
 
 cd lib/opte-ioctl
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -- --check
+ptime -m cargo +$NIGHTLY fmt -- --check
 
 header "analyze"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/opte.sh

@@ -3,25 +3,23 @@
 #: name = "opte"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = []
 #:
 
 set -o errexit
 set -o pipefail
 set -o xtrace
 
-function header {
-	echo "# ==== $* ==== #"
-}
+source .github/buildomat/common.sh
 
 cargo --version
 rustc --version
 
 cd lib/opte
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -- --check
+ptime -m cargo +$NIGHTLY fmt -- --check
 
 header "check docs"
 #
@@ -30,13 +28,13 @@ header "check docs"
 #
 # Use nightly which is needed for the `kernel` feature.
 RUSTDOCFLAGS="-D warnings" ptime -m \
-	    cargo +nightly-2024-11-18 doc --no-default-features --features=api,std,engine,kernel
+	cargo +$NIGHTLY doc --no-default-features --features=api,std,engine,kernel
 
 header "analyze std + api"
 ptime -m cargo clippy --all-targets
 
 header "analyze no_std + engine + kernel"
-ptime -m cargo +nightly-2024-11-18 clippy --no-default-features --features engine,kernel
+ptime -m cargo +$NIGHTLY clippy --no-default-features --features engine,kernel
 
 header "test"
 ptime -m cargo test

.github/buildomat/jobs/opteadm.sh

@@ -3,7 +3,7 @@
 #: name = "opteadm"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = [
 #:   "=/work/debug/opteadm",
 #:   "=/work/debug/opteadm.debug.sha256",
@@ -20,17 +20,15 @@ set -o errexit
 set -o pipefail
 set -o xtrace
 
-function header {
-	echo "# ==== $* ==== #"
-}
+source .github/buildomat/common.sh
 
 cargo --version
 rustc --version
 
 pushd bin/opteadm
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -- --check
+ptime -m cargo +$NIGHTLY fmt -- --check
 
 header "analyze"
 ptime -m cargo clippy --all-targets

.github/buildomat/jobs/oxide-vpc.sh

@@ -3,25 +3,23 @@
 #: name = "oxide-vpc"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = []
 #:
 
 set -o errexit
 set -o pipefail
 set -o xtrace
 
-function header {
-	echo "# ==== $* ==== #"
-}
+source .github/buildomat/common.sh
 
 cargo --version
 rustc --version
 
 cd lib/oxide-vpc
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -- --check
+ptime -m cargo +$NIGHTLY fmt -- --check
 
 header "check docs"
 #
@@ -30,13 +28,13 @@ header "check docs"
 #
 # Use nightly which is needed for the `kernel` feature.
 RUSTDOCFLAGS="-D warnings" ptime -m \
-	    cargo +nightly-2024-11-18 doc --no-default-features --features=api,std,engine,kernel
+	    cargo +$NIGHTLY doc --no-default-features --features=api,std,engine,kernel
 
 header "analyze std + api + usdt"
 ptime -m cargo clippy --features usdt --all-targets
 
 header "analyze no_std + engine + kernel"
-ptime -m cargo +nightly-2024-11-18 clippy --no-default-features --features engine,kernel
+ptime -m cargo +$NIGHTLY clippy --no-default-features --features engine,kernel
 
 header "test"
 ptime -m cargo test

.github/buildomat/jobs/p5p.sh

@@ -3,7 +3,7 @@
 #: name = "opte-p5p"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = [
 #:   "=/out/opte.p5p",
 #:   "=/out/opte.p5p.sha256",
@@ -24,6 +24,8 @@ set -o errexit
 set -o pipefail
 set -o xtrace
 
+source .github/buildomat/common.sh
+
 #
 # TGT_BASE allows one to run this more easily in their local
 # environment:
@@ -37,10 +39,6 @@ REL_TGT=$TGT_BASE/release
 
 mkdir -p $REL_TGT
 
-function header {
-	echo "# ==== $* ==== #"
-}
-
 cargo --version
 rustc --version
 

.github/buildomat/jobs/test.sh

@@ -3,7 +3,6 @@
 #: name = "test"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "stable"
 #: output_rules = [
 #:   "/work/*.log",
 #: ]

.github/buildomat/jobs/xde.sh

@@ -3,7 +3,7 @@
 #: name = "opte-xde"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "nightly-2024-11-18"
+#: rust_toolchain = true
 #: output_rules = [
 #:   "=/work/debug/xde.dbg",
 #:   "=/work/debug/xde.dbg.sha256",
@@ -31,6 +31,8 @@ set -o errexit
 set -o pipefail
 set -o xtrace
 
+source .github/buildomat/common.sh
+
 #
 # TGT_BASE allows one to run this more easily in their local
 # environment:
@@ -49,22 +51,6 @@ REL_TGT=$TGT_BASE/release
 
 mkdir -p $DBG_TGT $REL_TGT
 
-function header {
-	echo "# ==== $* ==== #"
-}
-
-function install_pkg {
-    set +o errexit
-    pfexec pkg install $1
-    exit_code=$?
-    # 4 is the exit code returned from pkg when the package is already installed
-    if [[ $exit_code -ne 0 ]] && [[ $exit_code -ne 4 ]]; then
-        echo "package install failed for $1"
-        exit 1
-    fi
-    set -o errexit
-}
-
 cargo --version
 rustc --version
 
@@ -75,7 +61,7 @@ pushd xde
 cp xde.conf /work/xde.conf
 
 header "check style"
-ptime -m cargo +nightly-2024-11-18 fmt -p xde -p xde-link -- --check
+ptime -m cargo +$NIGHTLY fmt -p xde -p xde-link -- --check
 
 header "analyze"
 ptime -m cargo clippy -- \
@@ -123,7 +109,7 @@ sha256sum $REL_TGT/xde_link.so > $REL_TGT/xde_link.so.sha256
 
 header "build xde integration tests"
 pushd xde-tests
-cargo +nightly-2024-11-18 fmt -- --check
+cargo +$NIGHTLY fmt -- --check
 cargo clippy --all-targets
 cargo build --test loopback
 loopback_test=$(

Cargo.toml

@@ -18,7 +18,7 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "MPL-2.0"
 repository = "https://github.com/oxidecomputer/opte"
 

bench/benches/userland.rs

@@ -6,11 +6,12 @@
 
 //! Userland packet parsing and processing microbenchmarks.
 
-use criterion::criterion_group;
-use criterion::criterion_main;
 use criterion::BenchmarkId;
 use criterion::Criterion;
+use criterion::criterion_group;
+use criterion::criterion_main;
 use opte::engine::packet::Packet;
+use opte_bench::MeasurementInfo;
 use opte_bench::alloc::*;
 use opte_bench::packet::BenchPacket;
 use opte_bench::packet::BenchPacketInstance;
@@ -22,7 +23,6 @@ use opte_bench::packet::ParserKind;
 use opte_bench::packet::TestCase;
 use opte_bench::packet::ULP_FAST_PATH;
 use opte_bench::packet::ULP_SLOW_PATH;
-use opte_bench::MeasurementInfo;
 use opte_test_utils::*;
 use std::hint::black_box;
 

bench/benches/xde.rs

@@ -19,14 +19,14 @@ use std::net::Ipv6Addr;
 use std::net::TcpListener;
 use std::path::Path;
 use std::process::Command;
+use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
-use std::sync::Arc;
 use std::time::Duration;
 #[cfg(target_os = "illumos")]
-use xde_tests::get_linklocal_addr;
-#[cfg(target_os = "illumos")]
 use xde_tests::Topology;
+#[cfg(target_os = "illumos")]
+use xde_tests::get_linklocal_addr;
 
 const DEFAULT_PORT: u16 = 0x1dee;