smklein · Sep 10, 2026 · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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"
@@ -589,7 +589,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"
@@ -619,6 +619,7 @@ 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.1.0"
 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" }

diff --git a/dev-tools/omdb/src/bin/omdb/db.rs b/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(),

diff --git a/installinator/src/write.rs b/installinator/src/write.rs
@@ -122,10 +122,10 @@ impl WriteDestination {
         let mut drives = BTreeMap::new();
 
         for disk in hardware.m2_disks() {
-            let Ok(slot) = M2Slot::try_from(disk.slot()) else {
+            let Ok(slot) = M2Slot::try_from(disk.pcie_slot()) else {
                 warn!(
                     log, "skipping M.2 drive with unexpected slot number";
-                    "slot" => disk.slot(),
+                    "pcie_slot" => disk.pcie_slot(),
                 );
                 continue;
             };
@@ -136,7 +136,7 @@ impl WriteDestination {
                         log, "found target M.2 disk";
                         "identity" => ?disk.identity(),
                         "path" => disk.devfs_path().as_str(),
-                        "slot" => disk.slot(),
+                        "pcie_slot" => disk.pcie_slot(),
                         "boot_image_path" => path.as_str(),
                         "zpool" => %disk.zpool_name(),
                     );
@@ -165,7 +165,7 @@ impl WriteDestination {
                                 log, "skipping duplicate M.2 drive entry";
                                 "identity" => ?disk.identity(),
                                 "path" => disk.devfs_path().as_str(),
-                                "slot" => disk.slot(),
+                                "pcie_slot" => disk.pcie_slot(),
                                 "boot_image_path" => path.as_str(),
                                 "zpool" => %disk.zpool_name(),
                             );
@@ -178,7 +178,7 @@ impl WriteDestination {
                         log, "found M.2 disk but failed to find boot image path";
                         "identity" => ?disk.identity(),
                         "path" => disk.devfs_path().as_str(),
-                        "slot" => disk.slot(),
+                        "pcie_slot" => disk.pcie_slot(),
                         "boot_image_path_err" => err,
                         "zpool" => %disk.zpool_name(),
                     );

diff --git a/nexus/db-model/src/inventory.rs b/nexus/db-model/src/inventory.rs
@@ -2359,11 +2359,17 @@ impl From<InvSvcEnabledNotOnlineState> for SvcEnabledNotOnlineState {
 pub struct InvPhysicalDisk {
     pub inv_collection_id: DbTypedUuid<CollectionKind>,
     pub sled_id: DbTypedUuid<SledKind>,
-    pub slot: i64,
+    /// See [`nexus_types::inventory::PhysicalDisk::pcie_slot`]. The column
+    /// keeps its original name because columns cannot be renamed
+    /// idempotently.
+    #[diesel(column_name = slot)]
+    pub pcie_slot: i64,
     pub vendor: String,
     pub model: String,
     pub serial: String,
     pub variant: PhysicalDiskKind,
+    /// See [`nexus_types::inventory::PhysicalDisk::location`].
+    pub location: Option<String>,
 }
 
 impl InvPhysicalDisk {
@@ -2375,11 +2381,12 @@ impl InvPhysicalDisk {
         Self {
             inv_collection_id: inv_collection_id.into(),
             sled_id: sled_id.into(),
-            slot: disk.slot,
+            pcie_slot: disk.pcie_slot,
             vendor: disk.identity.vendor,
             model: disk.identity.model,
             serial: disk.identity.serial,
             variant: disk.variant.into(),
+            location: disk.location,
         }
     }
 }
@@ -2410,7 +2417,9 @@ pub enum InvNvmeDiskFirmwareError {
 pub struct InvNvmeDiskFirmware {
     inv_collection_id: DbTypedUuid<CollectionKind>,
     sled_id: DbTypedUuid<SledKind>,
-    slot: i64,
+    /// See [`InvPhysicalDisk::pcie_slot`].
+    #[diesel(column_name = slot)]
+    pcie_slot: i64,
     active_slot: SqlU8,
     next_active_slot: Option<SqlU8>,
     number_of_slots: SqlU8,
@@ -2496,7 +2505,7 @@ impl InvNvmeDiskFirmware {
         Ok(Self {
             inv_collection_id: inv_collection_id.into(),
             sled_id: sled_id.into(),
-            slot: sled_slot,
+            pcie_slot: sled_slot,
             active_slot: firmware.active_slot.into(),
             next_active_slot: firmware.next_active_slot.map(|nas| nas.into()),
             number_of_slots: firmware.number_of_slots.into(),
@@ -2538,8 +2547,8 @@ impl InvNvmeDiskFirmware {
         self.sled_id
     }
 
-    pub fn slot(&self) -> i64 {
-        self.slot
+    pub fn pcie_slot(&self) -> i64 {
+        self.pcie_slot
     }
 
     pub fn number_of_slots(&self) -> SqlU8 {

diff --git a/nexus/db-model/src/schema_versions.rs b/nexus/db-model/src/schema_versions.rs
@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-pub const SCHEMA_VERSION: Version = Version::new(299, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(300, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ pub static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
+        KnownVersion::new(300, "inv-physical-disk-location"),
         KnownVersion::new(299, "blueprint-pruner-config"),
         KnownVersion::new(298, "blueprint-zone-multiple-external-ips"),
         KnownVersion::new(297, "inventory-zone-multiple-external-ips"),

diff --git a/nexus/db-queries/src/db/datastore/inventory.rs b/nexus/db-queries/src/db/datastore/inventory.rs
@@ -210,7 +210,7 @@ impl DataStore {
                             InvNvmeDiskFirmware::new(
                                 collection_id,
                                 sled_agent.sled_id,
-                                disk.slot,
+                                disk.pcie_slot,
                                 firmware,
                             )
                             .map_err(|e| {
@@ -3092,14 +3092,15 @@ impl DataStore {
                 .map_err(|e| {
                     public_error_from_diesel(e, ErrorHandler::Server)
                 })?;
-                paginator =
-                    p.found_batch(&batch, &|row| (row.sled_id(), row.slot()));
+                paginator = p.found_batch(&batch, &|row| {
+                    (row.sled_id(), row.pcie_slot())
+                });
                 for firmware in batch {
                     disk_firmware
                         .entry(firmware.sled_id().into())
                         .or_default()
                         .insert(
-                            firmware.slot(),
+                            firmware.pcie_slot(),
                             nexus_types::inventory::PhysicalDiskFirmware::from(
                                 firmware,
                             ),
@@ -3138,12 +3139,12 @@ impl DataStore {
                     public_error_from_diesel(e, ErrorHandler::Server)
                 })?;
                 paginator =
-                    p.found_batch(&batch, &|row| (row.sled_id, row.slot));
+                    p.found_batch(&batch, &|row| (row.sled_id, row.pcie_slot));
                 for disk in batch {
                     let sled_id = disk.sled_id.into();
                     let firmware = disk_firmware
                         .get(&sled_id)
-                        .and_then(|lookup| lookup.get(&disk.slot))
+                        .and_then(|lookup| lookup.get(&disk.pcie_slot))
                         .unwrap_or(&nexus_types::inventory::PhysicalDiskFirmware::Unknown);
 
                     disks.entry(sled_id).or_default().push(
@@ -3154,7 +3155,8 @@ impl DataStore {
                                 serial: disk.serial,
                             },
                             variant: disk.variant.into(),
-                            slot: disk.slot,
+                            pcie_slot: disk.pcie_slot,
+                            location: disk.location,
                             firmware: firmware.clone(),
                         },
                     );

diff --git a/nexus/db-queries/src/db/datastore/physical_disk.rs b/nexus/db-queries/src/db/datastore/physical_disk.rs
@@ -1155,7 +1155,8 @@ mod test {
                 model: "model".to_string(),
             },
             variant: DiskVariant::U2,
-            slot,
+            pcie_slot: slot,
+            location: None,
             active_firmware_slot: 1,
             next_active_firmware_slot: None,
             number_of_firmware_slots: 1,
@@ -1183,7 +1184,8 @@ mod test {
                 serial: inv_phys_disk.serial.clone(),
             },
             variant: inv_phys_disk.variant.into(),
-            slot: inv_phys_disk.slot,
+            pcie_slot: inv_phys_disk.pcie_slot,
+            location: inv_phys_disk.location.clone(),
             firmware: PhysicalDiskFirmware::Nvme(NvmeFirmware {
                 active_slot: inv_disk.active_firmware_slot,
                 next_active_slot: inv_disk.next_active_firmware_slot,

diff --git a/nexus/db-schema/src/schema.rs b/nexus/db-schema/src/schema.rs
@@ -2078,6 +2078,8 @@ table! {
         serial -> Text,
 
         variant -> crate::enums::PhysicalDiskKindEnum,
+
+        location -> Nullable<Text>,
     }
 }
 

diff --git a/nexus/inventory/src/examples.rs b/nexus/inventory/src/examples.rs
@@ -487,7 +487,8 @@ pub fn representative() -> Representative {
                 serial: "XXIV".to_string(),
             },
             variant: DiskVariant::M2,
-            slot: 0,
+            pcie_slot: 0,
+            location: None,
             active_firmware_slot: 1,
             next_active_firmware_slot: None,
             number_of_firmware_slots: 1,
@@ -502,7 +503,8 @@ pub fn representative() -> Representative {
                 serial: "0001".to_string(),
             },
             variant: DiskVariant::U2,
-            slot: 1,
+            pcie_slot: 1,
+            location: None,
             active_firmware_slot: 1,
             next_active_firmware_slot: None,
             number_of_firmware_slots: 1,
@@ -516,7 +518,8 @@ pub fn representative() -> Representative {
                 serial: "0002".to_string(),
             },
             variant: DiskVariant::U2,
-            slot: 2,
+            pcie_slot: 2,
+            location: None,
             active_firmware_slot: 1,
             next_active_firmware_slot: None,
             number_of_firmware_slots: 1,
@@ -530,7 +533,8 @@ pub fn representative() -> Representative {
                 serial: "5".to_string(),
             },
             variant: DiskVariant::U2,
-            slot: 3,
+            pcie_slot: 3,
+            location: None,
             active_firmware_slot: 1,
             next_active_firmware_slot: None,
             number_of_firmware_slots: 1,

diff --git a/nexus/reconfigurator/planning/src/system.rs b/nexus/reconfigurator/planning/src/system.rs
@@ -1535,7 +1535,8 @@ impl Sled {
                     .map(|(i, disk)| InventoryDisk {
                         identity: disk.disk_identity.clone(),
                         variant: DiskVariant::U2,
-                        slot: i64::try_from(i).unwrap(),
+                        pcie_slot: i64::try_from(i).unwrap(),
+                        location: None,
                         active_firmware_slot: 1,
                         next_active_firmware_slot: None,
                         number_of_firmware_slots: 1,

diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
@@ -6903,7 +6903,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
                 .into_iter()
                 .map(|d| UnadoptedPhysicalDisk {
                     sled_id: d.sled_id.into(),
-                    slot: d.slot,
+                    slot: d.pcie_slot,
                     variant: d.variant.into(),
                     disk_id: PhysicalDiskManufacturerIdentity {
                         vendor: d.vendor,
-Original file line number
+Diff line change
@@ Expand Up / @@ -2078,6 +2078,8 @@ table! { @@
             serial -> Text,
             variant -> crate::enums::PhysicalDiskKindEnum,
+            location -> Nullable<Text>,
         }
     }
@@ Expand Down @@