Report each disk's chassis location in sled inventory

.cargo/xtask.toml

@@ -59,3 +59,16 @@ binary_allow_list = [
   "sled-agent",
   "sled-agent-sim",
 ]
+
+# libtopo is the illumos hardware topology library, used by sled-hardware to
+# find each disk's chassis location. Like libnvme, it is only needed by
+# programs that inspect a sled's hardware from the global zone.
+[libraries."libtopo.so.1"]
+binary_allow_list = [
+  "installinator",
+  "omicron-dev",
+  "omicron-package",
+  "services-ledger-check-migrate",
+  "sled-agent",
+  "sled-agent-sim",
+]

Cargo.toml

@@ -534,8 +534,8 @@ filetime = "0.2.26"
 flate2 = "1.1.2"
 float-ord = "0.3.2"
 flume = "0.11.1"
-fmd-adm = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "846361bf0a698a8c7efefd97b2828b9aa74858c4" }
-fmd-adm-sys = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "846361bf0a698a8c7efefd97b2828b9aa74858c4" }
+fmd-adm = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "5b57d8dd36f96778d0c067ec9647ddde9b58ace7" }
+fmd-adm-sys = { git = "https://github.com/oxidecomputer/fmd-adm", rev = "5b57d8dd36f96778d0c067ec9647ddde9b58ace7" }
 foreign-types = "0.3.2"
 fs-err = "3.1.1"
 futures = "0.3.31"
@@ -590,7 +590,7 @@ hyper-util = "0.1.16"
 hyper-rustls = "0.27.7"
 hyper-staticfile = "0.10.1"
 iddqd = { version = "0.4.2", features = ["daft", "serde", "schemars08"] }
-illumos-nvpair = "0.3.0"
+illumos-nvpair = "0.4.0"
 illumos-nvpair-sys = "0.2.0"
 illumos-utils = { path = "illumos-utils" }
 iana-time-zone = "0.1.63"
@@ -620,6 +620,8 @@ libc = "0.2.174"
 linkme = "0.3"
 libipcc = { git = "https://github.com/oxidecomputer/ipcc-rs", rev = "524eb8f125003dff50b9703900c6b323f00f9e1b" }
 libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "dd5bb221d327a1bc9287961718c3c10d6bd37da0" }
+libtopo = "0.2.0"
+libtopo-sys = "0.1.1"
 linear-map = "1.2.0"
 live-tests-macros = { path = "live-tests/macros" }
 lldpd_client = { git = "https://github.com/oxidecomputer/lldp", rev = "54b266174d4de9628bca9c97b0db176e16f12154", package = "lldpd-client" }

dev-tools/omdb/Cargo.toml

@@ -109,6 +109,8 @@ uuid.workspace = true
 [target.'cfg(target_os = "illumos")'.dependencies]
 # See omicron-rpaths for more about the "fmd-adm-sys" dependency.
 fmd-adm-sys.workspace = true
+# See omicron-rpaths for more about the "libtopo-sys" dependency.
+libtopo-sys.workspace = true
 
 [dev-dependencies]
 camino-tempfile.workspace = true

dev-tools/omdb/src/bin/omdb/db.rs

@@ -7581,7 +7581,9 @@ async fn cmd_db_inventory_physical_disks(
     struct DiskRow {
         inv_collection_id: Uuid,
         sled_id: Uuid,
-        slot: i64,
+        pcie_slot: i64,
+        #[tabled(display_with = "display_option_blank")]
+        location: Option<String>,
         vendor: String,
         model: String,
         serial: String,
@@ -7634,7 +7636,8 @@ async fn cmd_db_inventory_physical_disks(
         DiskRow {
             inv_collection_id: disk.inv_collection_id.into_untyped_uuid(),
             sled_id: disk.sled_id.into_untyped_uuid(),
-            slot: disk.slot,
+            pcie_slot: disk.pcie_slot,
+            location: disk.location.clone(),
             vendor: disk.vendor,
             model: disk.model.clone(),
             serial: disk.serial.clone(),

dev-tools/omicron-dev/Cargo.toml

@@ -34,6 +34,8 @@ toml.workspace = true
 [target.'cfg(target_os = "illumos")'.dependencies]
 # See omicron-rpaths for more about the "fmd-adm-sys" dependency.
 fmd-adm-sys.workspace = true
+# See omicron-rpaths for more about the "libtopo-sys" dependency.
+libtopo-sys.workspace = true
 
 [dev-dependencies]
 expectorate.workspace = true

dev-tools/rack-init-config/Cargo.toml

@@ -7,6 +7,9 @@ license = "MPL-2.0"
 [lints]
 workspace = true
 
+[build-dependencies]
+omicron-rpaths.workspace = true
+
 [dependencies]
 bootstrap-agent-lockstep-types.workspace = true
 iddqd.workspace = true
@@ -18,6 +21,10 @@ sled-agent-types.workspace = true
 sled-hardware-types.workspace = true
 toml.workspace = true
 
+[target.'cfg(target_os = "illumos")'.dependencies]
+# See omicron-rpaths for more about the "libtopo-sys" dependency.
+libtopo-sys.workspace = true
+
 [dev-dependencies]
 camino-tempfile.workspace = true
 sled-agent-rack-setup.workspace = true

dev-tools/rack-init-config/build.rs

@@ -0,0 +1,10 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// See omicron-rpaths for documentation.
+// NOTE: This file MUST be kept in sync with the other build.rs files in this
+// repository.
+fn main() {
+    omicron_rpaths::configure_default_omicron_rpaths();
+}