From 404e7afaaa655763f7d8d1015b0eb09a701022ec Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Tue, 14 Oct 2025 22:09:54 +0000 Subject: [PATCH 1/4] fix(envrc): remove standalone -g flag causing rustdoc failures Remove the standalone `-g` flag which causes rustdoc failures for direnv users. The flag is redundant as debug information is already enabled through `-C debuginfo=full`. The more specific debuginfo flag provides equivalent functionality without the rustdoc compatibility issue. Signed-off-by: Daniel Noland --- .envrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.envrc b/.envrc index 2edeb99d1..41bfc8c5d 100644 --- a/.envrc +++ b/.envrc @@ -12,7 +12,7 @@ fi export NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1 CRT="-C target-feature=-crt-static" -DEBUG="-g -C debuginfo=full -C split-debuginfo=off -C dwarf-version=5" +DEBUG="-C debuginfo=full -C split-debuginfo=off -C dwarf-version=5" LINKER="-C linker=${COMPILE_ENV}/bin/clang -C link-arg=--ld-path=${COMPILE_ENV}/bin/ld.lld" RELRO="-C relro-level=full" TARGET_CPU="-C target-cpu=x86-64-v3" From fc22cc443de78638cedd324b21377ec45201ff3a Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Tue, 14 Oct 2025 22:10:38 +0000 Subject: [PATCH 2/4] style(nextest): reorder test-groups table to satisfy linter The linter demands that table names be organized this way :shrug: Signed-off-by: Daniel Noland --- .config/nextest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/nextest.toml b/.config/nextest.toml index 16b023236..f965366da 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -132,9 +132,6 @@ store-success-output = true # element. store-failure-output = true -[test-groups] -vm = { max-threads = 1 } - # [[profile.default.overrides]] # filter = 'test(flaky test name here)' # retries = 3 @@ -143,3 +140,6 @@ vm = { max-threads = 1 } filter = 'package(dataplane)' platform = 'cfg(unix)' test-group = 'vm' + +[test-groups] +vm = { max-threads = 1 } From e1df7417da53f371ff492359e379087b1eb3f2ea Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Tue, 14 Oct 2025 22:09:29 +0000 Subject: [PATCH 3/4] chore(codebook): add ethtool and sysfs to spell-check dictionary Add technical terms to allowed words list. Signed-off-by: Daniel Noland --- codebook.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codebook.toml b/codebook.toml index 23c34b73e..827cad7e5 100644 --- a/codebook.toml +++ b/codebook.toml @@ -20,6 +20,7 @@ words = [ "efa", "eprintln", "errno", + "ethtool", "ffff", "fredi", "frr", @@ -85,6 +86,7 @@ words = [ "smt", "subdevice", "subvendor", + "sysfs", "tailroom", "tctl", "tdebug", From 4ee91209c9675023393b90d4cf02ba4d966d7ce9 Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Tue, 14 Oct 2025 23:45:33 +0000 Subject: [PATCH 4/4] fix(deps): pin dplane-rpc to commit SHA instead of version Version isn't considered in git dependencies, so this isn't doing what we think it is doing. Instead, it is just following the default branch for the repo while pretending to be pinned. This should be resolved by cutting a proper tag for that repo, but in the mean time we can pin to a commit. Signed-off-by: Daniel Noland --- Cargo.lock | 140 +++++++++++++---------------------------------------- Cargo.toml | 2 +- 2 files changed, 34 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cacb5a8b..95127cd40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "afpacket" version = "0.2.3" @@ -257,21 +242,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc 0.2.177", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link 0.2.1", -] - [[package]] name = "base64" version = "0.7.0" @@ -314,7 +284,7 @@ dependencies = [ "bitflags 2.9.4", "cexpr", "clang-sys", - "itertools", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -396,7 +366,7 @@ dependencies = [ "arbitrary", "bolero-generator-derive", "either", - "getrandom 0.3.3", + "getrandom 0.3.4", "rand_core 0.9.3", "rand_xoshiro", ] @@ -598,9 +568,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -715,7 +685,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1538,7 +1508,7 @@ dependencies = [ [[package]] name = "dplane-rpc" version = "1.1.2" -source = "git+https://github.com/githedgehog/dplane-rpc.git#e8fc33db10e1d00785f2a2b90cbadcad7900f200" +source = "git+https://github.com/githedgehog/dplane-rpc.git?rev=e8fc33db10e1d00785f2a2b90cbadcad7900f200#e8fc33db10e1d00785f2a2b90cbadcad7900f200" dependencies = [ "bytes", "cbindgen", @@ -1854,27 +1824,21 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc 0.2.177", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc 0.2.177", "r-efi", - "wasi 0.14.7+wasi-0.2.4", + "wasip2", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "glob" version = "0.3.3" @@ -2304,22 +2268,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "serde", "serde_core", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc 0.2.177", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -2344,6 +2297,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -2601,15 +2563,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "1.0.4" @@ -2618,7 +2571,7 @@ checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc 0.2.177", "log", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "windows-sys 0.59.0", ] @@ -2889,15 +2842,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -3205,7 +3149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.106", @@ -3241,7 +3185,7 @@ dependencies = [ "libc 0.2.177", "once_cell", "raw-cpuid", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -3342,7 +3286,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] @@ -3537,12 +3481,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "rustc-demangle" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -3583,9 +3521,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -4124,7 +4062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -4257,29 +4195,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc 0.2.177", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", - "slab", "socket2", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -4645,7 +4580,7 @@ version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", "serde", "sha1_smol", @@ -4710,15 +4645,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasi" -version = "0.14.7+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" -dependencies = [ - "wasip2", -] - [[package]] name = "wasip2" version = "1.0.1+wasi-0.2.4" diff --git a/Cargo.toml b/Cargo.toml index bd0c74437..31daf45a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ config = { path = "./config", package = "dataplane-config" } dpdk = { path = "./dpdk", package = "dataplane-dpdk" } dpdk-sys = { path = "./dpdk-sys", package = "dataplane-dpdk-sys" } dpdk-sysroot-helper = { path = "./dpdk-sysroot-helper", package = "dataplane-dpdk-sysroot-helper" } -dplane-rpc = { git = "https://github.com/githedgehog/dplane-rpc.git", version = "1.1.2" } +dplane-rpc = { git = "https://github.com/githedgehog/dplane-rpc.git", rev = "e8fc33db10e1d00785f2a2b90cbadcad7900f200" } errno = { path = "./errno", package = "dataplane-errno" } flow-info = { path = "./flow-info", package = "dataplane-flow-info" } gateway_config = { git = "https://github.com/githedgehog/gateway-proto", tag = "v0.15.0" }