make sleds report their CPU families to Nexus

RFD 505 proposes that instances should be able to set a "minimum
hardware platform" or "minimum CPU platform" that allows users to
constrain an instance to run on sleds that have a specific set of CPU
features available. This allows a user to opt a VM into advanced
hardware features (e.g. AVX-512 support) by constraining it to run only
on sleds that support those features. For this to work, Nexus needs to
understand what CPUs are present in which sleds.

Have sled-agent query CPUID to get CPU vendor and family information and
report this to Nexus as part of the sled hardware manifest.

Author: gjcolombo

Cargo.lock

@@ -103,6 +103,7 @@ mod silo_group;
 mod silo_user;
 mod silo_user_password_hash;
 mod sled;
+mod sled_cpu_family;
 mod sled_instance;
 mod sled_policy;
 mod sled_resource_vmm;
@@ -223,6 +224,7 @@ pub use silo_group::*;
 pub use silo_user::*;
 pub use silo_user_password_hash::*;
 pub use sled::*;
+pub use sled_cpu_family::*;
 pub use sled_instance::*;
 pub use sled_policy::to_db_sled_policy; // Do not expose DbSledPolicy
 pub use sled_resource_vmm::*;

nexus/db-model/src/lib.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(173, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(174, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ 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(174, "sled-cpu-family"),
         KnownVersion::new(173, "inv-internal-dns"),
         KnownVersion::new(172, "add-zones-with-mupdate-override"),
         KnownVersion::new(171, "inv-clear-mupdate-override"),

nexus/db-model/src/schema_versions.rs

@@ -6,6 +6,7 @@ use super::{ByteCount, Generation, SledState, SqlU16, SqlU32};
 use crate::collection::DatastoreCollectionConfig;
 use crate::ipv6;
 use crate::sled::shared::Baseboard;
+use crate::sled_cpu_family::SledCpuFamily;
 use crate::sled_policy::DbSledPolicy;
 use chrono::{DateTime, Utc};
 use db_macros::Asset;
@@ -40,6 +41,8 @@ pub struct SledSystemHardware {
 
     // current VMM reservoir size
     pub reservoir_size: ByteCount,
+
+    pub cpu_family: SledCpuFamily,
 }
 
 /// Database representation of a Sled.
@@ -84,6 +87,9 @@ pub struct Sled {
 
     // ServiceAddress (Repo Depot API). Uses `ip`.
     pub repo_depot_port: SqlU16,
+
+    /// The family of this sled's CPU.
+    pub cpu_family: SledCpuFamily,
 }
 
 impl Sled {
@@ -141,6 +147,7 @@ impl From<Sled> for views::Sled {
             state: sled.state.into(),
             usable_hardware_threads: sled.usable_hardware_threads.0,
             usable_physical_ram: *sled.usable_physical_ram,
+            cpu_family: sled.cpu_family.into(),
         }
     }
 }
@@ -185,6 +192,7 @@ impl From<Sled> for params::SledAgentInfo {
             usable_physical_ram: sled.usable_physical_ram.into(),
             reservoir_size: sled.reservoir_size.into(),
             generation: sled.sled_agent_gen.into(),
+            cpu_family: sled.cpu_family.into(),
             decommissioned,
         }
     }
@@ -229,6 +237,8 @@ pub struct SledUpdate {
     // ServiceAddress (Repo Depot API). Uses `ip`.
     pub repo_depot_port: SqlU16,
 
+    pub cpu_family: SledCpuFamily,
+
     // Generation number - owned and incremented by sled-agent.
     pub sled_agent_gen: Generation,
 }
@@ -258,6 +268,7 @@ impl SledUpdate {
             ip: addr.ip().into(),
             port: addr.port().into(),
             repo_depot_port: repo_depot_port.into(),
+            cpu_family: hardware.cpu_family,
             sled_agent_gen,
         }
     }
@@ -296,6 +307,7 @@ impl SledUpdate {
             repo_depot_port: self.repo_depot_port,
             last_used_address,
             sled_agent_gen: self.sled_agent_gen,
+            cpu_family: self.cpu_family,
         }
     }
 

nexus/db-model/src/sled.rs

@@ -0,0 +1,57 @@
+// 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/.
+
+use super::impl_enum_type;
+use serde::{Deserialize, Serialize};
+
+impl_enum_type!(
+    SledCpuFamilyEnum:
+
+    #[derive(
+        Copy,
+        Clone,
+        Debug,
+        PartialEq,
+        AsExpression,
+        FromSqlRow,
+        Serialize,
+        Deserialize
+    )]
+    pub enum SledCpuFamily;
+
+    Unknown => b"unknown"
+    AmdMilan => b"amd_milan"
+    AmdTurin => b"amd_turin"
+);
+
+impl From<nexus_types::internal_api::params::SledCpuFamily> for SledCpuFamily {
+    fn from(value: nexus_types::internal_api::params::SledCpuFamily) -> Self {
+        use nexus_types::internal_api::params::SledCpuFamily as InputFamily;
+        match value {
+            InputFamily::Unknown => Self::Unknown,
+            InputFamily::AmdMilan => Self::AmdMilan,
+            InputFamily::AmdTurin => Self::AmdTurin,
+        }
+    }
+}
+
+impl From<SledCpuFamily> for nexus_types::internal_api::params::SledCpuFamily {
+    fn from(value: SledCpuFamily) -> Self {
+        match value {
+            SledCpuFamily::Unknown => Self::Unknown,
+            SledCpuFamily::AmdMilan => Self::AmdMilan,
+            SledCpuFamily::AmdTurin => Self::AmdTurin,
+        }
+    }
+}
+
+impl From<SledCpuFamily> for nexus_types::external_api::views::SledCpuFamily {
+    fn from(value: SledCpuFamily) -> Self {
+        match value {
+            SledCpuFamily::Unknown => Self::Unknown,
+            SledCpuFamily::AmdMilan => Self::AmdMilan,
+            SledCpuFamily::AmdTurin => Self::AmdTurin,
+        }
+    }
+}

nexus/db-model/src/sled_cpu_family.rs

@@ -294,6 +294,7 @@ mod test {
     use crate::db::pub_test_utils::TestDatabase;
     use nexus_db_model::Generation;
     use nexus_db_model::SledBaseboard;
+    use nexus_db_model::SledCpuFamily;
     use nexus_db_model::SledSystemHardware;
     use nexus_db_model::SledUpdate;
     use omicron_common::api::external::ByteCount;
@@ -323,6 +324,7 @@ mod test {
                 usable_hardware_threads: 128,
                 usable_physical_ram: (64 << 30).try_into().unwrap(),
                 reservoir_size: (16 << 30).try_into().unwrap(),
+                cpu_family: SledCpuFamily::AmdMilan,
             },
             Uuid::new_v4(),
             Generation::new(),

nexus/db-queries/src/db/datastore/crucible_dataset.rs

@@ -515,6 +515,7 @@ mod test {
     use crate::db::pub_test_utils::TestDatabase;
     use nexus_db_model::Generation;
     use nexus_db_model::SledBaseboard;
+    use nexus_db_model::SledCpuFamily;
     use nexus_db_model::SledSystemHardware;
     use nexus_db_model::SledUpdate;
     use nexus_db_model::Zpool;
@@ -617,6 +618,7 @@ mod test {
                     usable_hardware_threads: 128,
                     usable_physical_ram: (64 << 30).try_into().unwrap(),
                     reservoir_size: (16 << 30).try_into().unwrap(),
+                    cpu_family: SledCpuFamily::AmdMilan,
                 },
                 rack_id,
                 Generation::new(),

nexus/db-queries/src/db/datastore/support_bundle.rs

@@ -25,6 +25,7 @@ use nexus_db_model::ProjectImage;
 use nexus_db_model::ProjectImageIdentity;
 use nexus_db_model::Resources;
 use nexus_db_model::SledBaseboard;
+use nexus_db_model::SledCpuFamily;
 use nexus_db_model::SledSystemHardware;
 use nexus_db_model::SledUpdate;
 use nexus_db_model::Snapshot;
@@ -77,6 +78,7 @@ pub struct SledSystemHardwareBuilder {
     usable_hardware_threads: u32,
     usable_physical_ram: i64,
     reservoir_size: i64,
+    cpu_family: SledCpuFamily,
 }
 
 impl Default for SledSystemHardwareBuilder {
@@ -86,6 +88,7 @@ impl Default for SledSystemHardwareBuilder {
             usable_hardware_threads: 4,
             usable_physical_ram: 1 << 40,
             reservoir_size: 1 << 39,
+            cpu_family: SledCpuFamily::AmdMilan,
         }
     }
 }
@@ -121,12 +124,18 @@ impl SledSystemHardwareBuilder {
         self
     }
 
+    pub fn cpu_family(&mut self, family: SledCpuFamily) -> &mut Self {
+        self.cpu_family = family;
+        self
+    }
+
     pub fn build(&self) -> SledSystemHardware {
         SledSystemHardware {
             is_scrimlet: self.is_scrimlet,
             usable_hardware_threads: self.usable_hardware_threads,
             usable_physical_ram: self.usable_physical_ram.try_into().unwrap(),
             reservoir_size: self.reservoir_size.try_into().unwrap(),
+            cpu_family: self.cpu_family,
         }
     }
 }

nexus/db-queries/src/db/pub_test_utils/helpers.rs

@@ -72,6 +72,7 @@ define_enums! {
     RouterRouteKindEnum => "router_route_kind",
     SagaStateEnum => "saga_state",
     ServiceKindEnum => "service_kind",
+    SledCpuFamilyEnum => "sled_cpu_family",
     SledPolicyEnum => "sled_policy",
     SledRoleEnum => "sled_role",
     SledStateEnum => "sled_state",

nexus/db-schema/src/enums.rs

@@ -971,6 +971,7 @@ table! {
         sled_state -> crate::enums::SledStateEnum,
         sled_agent_gen -> Int8,
         repo_depot_port -> Int4,
+        cpu_family -> crate::enums::SledCpuFamilyEnum,
     }
 }