From c2333d12d1fc986ac13d5c56bb4d564e201fc225 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Mon, 4 Dec 2023 12:05:17 -0800
Subject: [PATCH 1/6] bump softnpu

---
 .cargo/config.toml |   5 +
 Cargo.lock         | 446 ++++++++++++++++++++++++++++++++++++++++++++-
 Cargo.toml         |   2 +-
 3 files changed, 445 insertions(+), 8 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 54d6162ee..30fd6fabc 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,7 @@
 [alias]
 xtask = "run --package xtask --quiet --"
+
+[env]
+# Currently required by Falcon due to
+# https://github.com/rust-lang/cargo/issues/3946#issuecomment-973132993
+CARGO_WORKSPACE_DIR = { value = "", relative = true }
diff --git a/Cargo.lock b/Cargo.lock
index a711578b1..40bf478bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -808,6 +808,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "cstr-argument"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bd9c8e659a473bce955ae5c35b116af38af11a7acb0b480e01f3ed348aeb40"
+dependencies = [
+ "cfg-if",
+ "memchr",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -827,6 +837,36 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "curl"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+dependencies = [
+ "curl-sys",
+ "libc",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "socket2 0.4.9",
+ "winapi",
+]
+
+[[package]]
+name = "curl-sys"
+version = "0.4.68+curl-8.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -951,7 +991,20 @@ version = "0.2.0"
 source = "git+https://github.com/oxidecomputer/dlpi-sys?branch=main#1d587ea98cf2d36f1b1624b0b960559c76d475d2"
 dependencies = [
  "libc",
- "libdlpi-sys",
+ "libdlpi-sys 0.1.0 (git+https://github.com/oxidecomputer/dlpi-sys?branch=main)",
+ "num_enum 0.5.11",
+ "pretty-hex",
+ "thiserror",
+ "tokio",
+]
+
+[[package]]
+name = "dlpi"
+version = "0.2.0"
+source = "git+https://github.com/oxidecomputer/dlpi-sys#1d587ea98cf2d36f1b1624b0b960559c76d475d2"
+dependencies = [
+ "libc",
+ "libdlpi-sys 0.1.0 (git+https://github.com/oxidecomputer/dlpi-sys)",
  "num_enum 0.5.11",
  "pretty-hex",
  "thiserror",
@@ -973,6 +1026,12 @@ dependencies = [
  "slog",
 ]
 
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
 [[package]]
 name = "dof"
 version = "0.1.5"
@@ -1240,7 +1299,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1249,6 +1329,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -1562,6 +1648,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-range-header"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1613,11 +1705,25 @@ dependencies = [
  "futures-util",
  "http",
  "hyper",
+ "log",
  "rustls",
+ "rustls-native-certs",
  "tokio",
  "tokio-rustls",
 ]
 
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -1848,6 +1954,20 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "8.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+dependencies = [
+ "base64 0.21.5",
+ "pem",
+ "ring",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1865,6 +1985,11 @@ name = "libdlpi-sys"
 version = "0.1.0"
 source = "git+https://github.com/oxidecomputer/dlpi-sys?branch=main#1d587ea98cf2d36f1b1624b0b960559c76d475d2"
 
+[[package]]
+name = "libdlpi-sys"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/dlpi-sys#1d587ea98cf2d36f1b1624b0b960559c76d475d2"
+
 [[package]]
 name = "libgit2-sys"
 version = "0.15.2+1.6.4"
@@ -1893,6 +2018,25 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
+[[package]]
+name = "libnet"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#59e69ef8fb17be233e336cf4943e31ae398aa4d1"
+dependencies = [
+ "anyhow",
+ "cfg-if",
+ "colored",
+ "dlpi 0.2.0 (git+https://github.com/oxidecomputer/dlpi-sys)",
+ "libc",
+ "num_enum 0.5.11",
+ "nvpair",
+ "nvpair-sys",
+ "rusty-doors",
+ "socket2 0.4.9",
+ "thiserror",
+ "tracing",
+]
+
 [[package]]
 name = "libsqlite3-sys"
 version = "0.26.0"
@@ -2302,6 +2446,21 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
+[[package]]
+name = "nvpair"
+version = "0.5.0"
+source = "git+https://github.com/jmesmon/rust-libzfs?branch=master#ecd5a922247a6c5acef55d76c5b8d115572bc850"
+dependencies = [
+ "cstr-argument",
+ "foreign-types 0.5.0",
+ "nvpair-sys",
+]
+
+[[package]]
+name = "nvpair-sys"
+version = "0.4.0"
+source = "git+https://github.com/jmesmon/rust-libzfs?branch=master#ecd5a922247a6c5acef55d76c5b8d115572bc850"
+
 [[package]]
 name = "object"
 version = "0.32.0"
@@ -2311,6 +2470,43 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "octocrab"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0bc095e456c43e3afe5a53cdcf11aae1965663b941f7a5efb49b6ef53ce8529"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "base64 0.21.5",
+ "bytes",
+ "cfg-if",
+ "chrono",
+ "either",
+ "futures",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-timeout",
+ "jsonwebtoken",
+ "once_cell",
+ "percent-encoding",
+ "pin-project",
+ "secrecy",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "snafu",
+ "tokio",
+ "tower",
+ "tower-http",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "omicron-common"
 version = "0.1.0"
@@ -2426,7 +2622,7 @@ checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
 dependencies = [
  "bitflags 2.4.0",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -2526,7 +2722,7 @@ dependencies = [
 [[package]]
 name = "p4rs"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/p4?rev=d59491f86668e15e92f35ffe3f94504ff4241c64#d59491f86668e15e92f35ffe3f94504ff4241c64"
+source = "git+https://github.com/oxidecomputer/p4?branch=mod#e1d66d0cb412b08dfd906654051c0fdaace37d0d"
 dependencies = [
  "bitvec",
  "colored",
@@ -2651,6 +2847,15 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.0"
@@ -2801,6 +3006,26 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -3030,7 +3255,7 @@ dependencies = [
  "crucible",
  "crucible-client-types",
  "dladm",
- "dlpi",
+ "dlpi 0.2.0 (git+https://github.com/oxidecomputer/dlpi-sys?branch=main)",
  "erased-serde",
  "futures",
  "ispf",
@@ -3578,6 +3803,18 @@ dependencies = [
  "sct",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -3603,6 +3840,24 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
+[[package]]
+name = "rusty-doors"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/rusty-doors#42ad0104095425eea76934b5d735b4c6a438ef66"
+dependencies = [
+ "libc",
+ "rusty-doors-macros",
+]
+
+[[package]]
+name = "rusty-doors-macros"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/rusty-doors#42ad0104095425eea76934b5d735b4c6a438ef66"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -3670,6 +3925,15 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -3899,6 +4163,19 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha256"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "hex",
+ "sha2",
+ "tokio",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -3923,6 +4200,18 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
 
+[[package]]
+name = "simple_asn1"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -4050,6 +4339,29 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
+[[package]]
+name = "snafu"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
+dependencies = [
+ "backtrace",
+ "doc-comment",
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "socket2"
 version = "0.4.9"
@@ -4073,27 +4385,33 @@ dependencies = [
 [[package]]
 name = "softnpu"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/softnpu?rev=88f5f1334364e5580fe778c44ac0746a35927351#88f5f1334364e5580fe778c44ac0746a35927351"
+source = "git+https://github.com/oxidecomputer/softnpu?rev=ed919c8ae1cadbab9501040585648e50ab52c2de#ed919c8ae1cadbab9501040585648e50ab52c2de"
 dependencies = [
  "anstyle",
  "anyhow",
  "clap 4.4.0",
+ "curl",
  "devinfo 0.1.0 (git+https://github.com/oxidecomputer/devinfo-sys?branch=main)",
- "dlpi",
+ "dlpi 0.2.0 (git+https://github.com/oxidecomputer/dlpi-sys?branch=main)",
  "indicatif",
  "libc",
  "libloading",
+ "libnet",
+ "octocrab",
  "p4rs",
  "p9ds 0.1.0 (git+https://github.com/oxidecomputer/p9fs?branch=main)",
  "p9kp",
  "serde",
  "serde_json",
+ "sha256",
  "slog",
  "slog-async",
  "slog-envlogger",
  "slog-term",
  "tokio",
  "toml 0.5.11",
+ "zone 0.2.0",
+ "ztest",
 ]
 
 [[package]]
@@ -4409,6 +4727,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "2.2.0"
@@ -4560,6 +4888,48 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+dependencies = [
+ "bitflags 2.4.0",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-range-header",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -4862,6 +5232,7 @@ dependencies = [
  "form_urlencoded",
  "idna 0.4.0",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -5473,3 +5844,64 @@ name = "zeroize"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+
+[[package]]
+name = "zone"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0545a42fbd7a81245726d54a0146cb4fd93882ebb6da50d60acf2e37394f198"
+dependencies = [
+ "itertools 0.10.5",
+ "thiserror",
+ "zone_cfg_derive 0.2.0",
+]
+
+[[package]]
+name = "zone"
+version = "0.3.0"
+source = "git+https://github.com/oxidecomputer/zone#5503b472dd87a3e6443624e1b42844882d6f769c"
+dependencies = [
+ "itertools 0.10.5",
+ "thiserror",
+ "zone_cfg_derive 0.3.0",
+]
+
+[[package]]
+name = "zone_cfg_derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef224b009d070d3b1adb9e375fcf8ec2f1948a412c3bbf8755c0ef4e3f91ef94"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "zone_cfg_derive"
+version = "0.3.0"
+source = "git+https://github.com/oxidecomputer/zone#5503b472dd87a3e6443624e1b42844882d6f769c"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ztest"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/falcon#7910ec7d1f283c4a9c3c5f42b25ec03a0a8ab87e"
+dependencies = [
+ "anyhow",
+ "libnet",
+ "slog",
+ "slog-async",
+ "slog-envlogger",
+ "slog-term",
+ "tokio",
+ "zone 0.3.0",
+]
diff --git a/Cargo.toml b/Cargo.toml
index c5c62fc5f..bffb2502f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ dlpi = { git = "https://github.com/oxidecomputer/dlpi-sys", branch = "main" }
 ispf = { git = "https://github.com/oxidecomputer/ispf" }
 libloading = "0.7"
 p9ds = { git = "https://github.com/oxidecomputer/p9fs" }
-softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu", rev = "88f5f1334364e5580fe778c44ac0746a35927351", package = "softnpu" }
+softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu", rev = "ed919c8ae1cadbab9501040585648e50ab52c2de", package = "softnpu" }
 
 # Omicron-related
 internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }

From a11fdd109a84a92420d2544a01c4063f1bcc1550 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Tue, 5 Dec 2023 09:32:22 -0800
Subject: [PATCH 2/6] run clippy for falcon build against illumos

---
 .github/workflows/rust.yml | 1 +
 xtask/src/task_clippy.rs   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 16942bff1..3ceb5965e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -28,6 +28,7 @@ jobs:
     - uses: dtolnay/rust-toolchain@439cf607258077187679211f12aa6f19af4a0af7 # master @ 2023-10-08
       with:
         toolchain: stable
+        target: x86_64-unknown-illumos
     - name: Report clippy version
       run: cargo clippy -- --version
     - name: Check clippy
diff --git a/xtask/src/task_clippy.rs b/xtask/src/task_clippy.rs
index 1dd409c43..f14c91be6 100644
--- a/xtask/src/task_clippy.rs
+++ b/xtask/src/task_clippy.rs
@@ -46,6 +46,8 @@ pub(crate) fn cmd_clippy(strict: bool, quiet: bool) -> Result<()> {
         "propolis-server",
         "-p",
         "propolis-client",
+        "--target",
+        "x86_64-unknown-illumos",
     ])?;
 
     // Check the mock server

From 1a5ea364cf13380646ed0f275e64ec30e2552a85 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Tue, 5 Dec 2023 10:56:35 -0800
Subject: [PATCH 3/6] throw in the towel for clippy on linux with falcon
 features

---
 .github/buildomat/jobs/falcon-build.sh |  1 +
 .github/workflows/rust.yml             |  1 -
 xtask/src/task_clippy.rs               | 21 +++++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/buildomat/jobs/falcon-build.sh b/.github/buildomat/jobs/falcon-build.sh
index 1f87e8d09..2d1cd6b09 100644
--- a/.github/buildomat/jobs/falcon-build.sh
+++ b/.github/buildomat/jobs/falcon-build.sh
@@ -18,6 +18,7 @@ rustc --version
 
 banner check
 ptime -m cargo check --features falcon
+ptime -m cargo xtask clippy
 
 banner build
 ptime -m cargo build --features falcon --release \
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3ceb5965e..16942bff1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -28,7 +28,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@439cf607258077187679211f12aa6f19af4a0af7 # master @ 2023-10-08
       with:
         toolchain: stable
-        target: x86_64-unknown-illumos
     - name: Report clippy version
       run: cargo clippy -- --version
     - name: Check clippy
diff --git a/xtask/src/task_clippy.rs b/xtask/src/task_clippy.rs
index f14c91be6..2b1df3c99 100644
--- a/xtask/src/task_clippy.rs
+++ b/xtask/src/task_clippy.rs
@@ -39,16 +39,17 @@ pub(crate) fn cmd_clippy(strict: bool, quiet: bool) -> Result<()> {
         run_clippy(&["-p", "propolis-server", "--features", "omicron-build"])?;
 
     // Check the Falcon bits
-    failed |= run_clippy(&[
-        "--features",
-        "falcon",
-        "-p",
-        "propolis-server",
-        "-p",
-        "propolis-client",
-        "--target",
-        "x86_64-unknown-illumos",
-    ])?;
+    #[cfg(target_os = "illumos")]
+    {
+        failed |= run_clippy(&[
+            "--features",
+            "falcon",
+            "-p",
+            "propolis-server",
+            "-p",
+            "propolis-client",
+        ])?;
+    }
 
     // Check the mock server
     failed |= run_clippy(&["-p", "propolis-mock-server"])?;

From 062252976a2a51d4e72d2d464cbb1e0f691fc938 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Thu, 14 Dec 2023 12:04:49 -0800
Subject: [PATCH 4/6] review feedback

---
 .github/buildomat/jobs/falcon-build.sh |  2 +-
 Cargo.lock                             |  2 +-
 xtask/src/task_clippy.rs               | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/buildomat/jobs/falcon-build.sh b/.github/buildomat/jobs/falcon-build.sh
index 2d1cd6b09..c2bcfa2e6 100644
--- a/.github/buildomat/jobs/falcon-build.sh
+++ b/.github/buildomat/jobs/falcon-build.sh
@@ -18,7 +18,7 @@ rustc --version
 
 banner check
 ptime -m cargo check --features falcon
-ptime -m cargo xtask clippy
+ptime -m clippy --features falcon --all-targets
 
 banner build
 ptime -m cargo build --features falcon --release \
diff --git a/Cargo.lock b/Cargo.lock
index 40bf478bb..d3db66bfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2021,7 +2021,7 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 [[package]]
 name = "libnet"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#59e69ef8fb17be233e336cf4943e31ae398aa4d1"
+source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#d44d9e084f39e844f8083d4d9b39a331061ebbcc"
 dependencies = [
  "anyhow",
  "cfg-if",
diff --git a/xtask/src/task_clippy.rs b/xtask/src/task_clippy.rs
index 2b1df3c99..1dd409c43 100644
--- a/xtask/src/task_clippy.rs
+++ b/xtask/src/task_clippy.rs
@@ -39,17 +39,14 @@ pub(crate) fn cmd_clippy(strict: bool, quiet: bool) -> Result<()> {
         run_clippy(&["-p", "propolis-server", "--features", "omicron-build"])?;
 
     // Check the Falcon bits
-    #[cfg(target_os = "illumos")]
-    {
-        failed |= run_clippy(&[
-            "--features",
-            "falcon",
-            "-p",
-            "propolis-server",
-            "-p",
-            "propolis-client",
-        ])?;
-    }
+    failed |= run_clippy(&[
+        "--features",
+        "falcon",
+        "-p",
+        "propolis-server",
+        "-p",
+        "propolis-client",
+    ])?;
 
     // Check the mock server
     failed |= run_clippy(&["-p", "propolis-mock-server"])?;

From eb8692365e9c1b4701303fc32e14a0aeb9686e84 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Thu, 14 Dec 2023 12:07:24 -0800
Subject: [PATCH 5/6] shift to main softnpu branch

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3db66bfa..282ab4ef6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2722,7 +2722,7 @@ dependencies = [
 [[package]]
 name = "p4rs"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/p4?branch=mod#e1d66d0cb412b08dfd906654051c0fdaace37d0d"
+source = "git+https://github.com/oxidecomputer/p4?branch=main#b1007658f9638dfc60af75286ff5c108d6b2714c"
 dependencies = [
  "bitvec",
  "colored",
@@ -4385,7 +4385,7 @@ dependencies = [
 [[package]]
 name = "softnpu"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/softnpu?rev=ed919c8ae1cadbab9501040585648e50ab52c2de#ed919c8ae1cadbab9501040585648e50ab52c2de"
+source = "git+https://github.com/oxidecomputer/softnpu?rev=dbab082dfa89da5db5ca2325c257089d2f130092#dbab082dfa89da5db5ca2325c257089d2f130092"
 dependencies = [
  "anstyle",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index bffb2502f..5342c7666 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ dlpi = { git = "https://github.com/oxidecomputer/dlpi-sys", branch = "main" }
 ispf = { git = "https://github.com/oxidecomputer/ispf" }
 libloading = "0.7"
 p9ds = { git = "https://github.com/oxidecomputer/p9fs" }
-softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu", rev = "ed919c8ae1cadbab9501040585648e50ab52c2de", package = "softnpu" }
+softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu", rev = "dbab082dfa89da5db5ca2325c257089d2f130092", package = "softnpu" }
 
 # Omicron-related
 internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }

From 4704d60118024fb130b5ccaa6fbb9f5cac763b9b Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Thu, 14 Dec 2023 12:26:42 -0800
Subject: [PATCH 6/6] :facepalm:

---
 .github/buildomat/jobs/falcon-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/buildomat/jobs/falcon-build.sh b/.github/buildomat/jobs/falcon-build.sh
index c2bcfa2e6..b4cc06048 100644
--- a/.github/buildomat/jobs/falcon-build.sh
+++ b/.github/buildomat/jobs/falcon-build.sh
@@ -18,7 +18,7 @@ rustc --version
 
 banner check
 ptime -m cargo check --features falcon
-ptime -m clippy --features falcon --all-targets
+ptime -m cargo clippy --features falcon --all-targets
 
 banner build
 ptime -m cargo build --features falcon --release \