Skip to content

fix: distinguish Supermicro and DGX GB300 BIOS behavior #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
martinraumann wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: distinguish Supermicro and DGX GB300 BIOS behavior #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/model/service_root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ impl ServiceRoot {
})
}

pub fn is_supermicro(&self) -> bool {
self.vendor_string()
.is_some_and(|vendor| vendor.eq_ignore_ascii_case("supermicro"))
}

pub fn vendor(&self) -> Option<RedfishVendor> {
let v = self.vendor_string().unwrap_or("Unknown".to_string());
Some(match v.to_lowercase().as_str() {
Expand Down Expand Up @@ -167,6 +172,7 @@ mod test {
..Default::default()
};
assert_eq!(result.vendor().unwrap(), RedfishVendor::NvidiaGBx00);
assert!(result.is_supermicro());
}

#[test]
Expand Down
70 changes: 47 additions & 23 deletions src/nvidia_gbx00.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ impl Bmc {
.is_some_and(|model| model.contains("GB300"))
}))
}

async fn is_supermicro_gb300(&self) -> Result<bool, RedfishError> {
Ok(self.s.is_supermicro() && self.is_gb300().await?)
}
}

#[derive(Copy, Clone)]
Expand Down Expand Up @@ -541,15 +545,15 @@ impl Redfish for Bmc {
>,
) -> crate::RedfishFuture<'a, Result<Option<String>, RedfishError>> {
Box::pin(async move {
let is_gb300 = self.is_gb300().await?;
let is_supermicro_gb300 = self.is_supermicro_gb300().await?;

// The Supermicro GB300 SecureBoot resource does not expose
// SecureBootEnable, so there is no supported setting to change.
if !is_gb300 {
if !is_supermicro_gb300 {
self.disable_secure_boot().await?;
}

let bios_attrs = self.machine_setup_attrs(is_gb300).await?;
let bios_attrs = self.machine_setup_attrs(is_supermicro_gb300).await?;
let mut attrs = HashMap::new();
attrs.extend(bios_attrs);
let body = HashMap::from([("Attributes", attrs)]);
Expand Down Expand Up @@ -867,7 +871,7 @@ impl Redfish for Bmc {

fn enable_secure_boot<'a>(&'a self) -> crate::RedfishFuture<'a, Result<(), RedfishError>> {
Box::pin(async move {
if self.is_gb300().await? {
if self.is_supermicro_gb300().await? {
return Err(RedfishError::NotSupported(
"Supermicro GB300 does not expose SecureBootEnable".to_string(),
));
Expand All @@ -878,7 +882,7 @@ impl Redfish for Bmc {

fn disable_secure_boot<'a>(&'a self) -> crate::RedfishFuture<'a, Result<(), RedfishError>> {
Box::pin(async move {
if self.is_gb300().await? {
if self.is_supermicro_gb300().await? {
return Err(RedfishError::NotSupported(
"Supermicro GB300 does not expose SecureBootEnable".to_string(),
));
Expand Down Expand Up @@ -1212,7 +1216,7 @@ impl Redfish for Bmc {

fn enable_infinite_boot<'a>(&'a self) -> crate::RedfishFuture<'a, Result<(), RedfishError>> {
Box::pin(async move {
if self.is_gb300().await? {
if self.is_supermicro_gb300().await? {
return Err(RedfishError::NotSupported(
"Supermicro GB300 does not expose EmbeddedUefiShell".to_string(),
));
Expand All @@ -1229,7 +1233,7 @@ impl Redfish for Bmc {
&'a self,
) -> crate::RedfishFuture<'a, Result<Option<bool>, RedfishError>> {
Box::pin(async move {
if self.is_gb300().await? {
if self.is_supermicro_gb300().await? {
return Ok(None);
}
let embedded_uefi_shell = self.get_embedded_uefi_shell_status().await?;
Expand Down Expand Up @@ -1410,8 +1414,8 @@ impl Bmc {
}

let bios = self.s.bios_attributes().await?;
let is_gb300 = self.is_gb300().await?;
let expected_attrs = self.machine_setup_attrs(is_gb300).await?;
let is_supermicro_gb300 = self.is_supermicro_gb300().await?;
let expected_attrs = self.machine_setup_attrs(is_supermicro_gb300).await?;
for (key, expected) in expected_attrs {
let Some(actual) = bios.get(&key) else {
diffs.push(MachineSetupDiff {
Expand Down Expand Up @@ -1542,24 +1546,14 @@ impl Bmc {

async fn machine_setup_attrs(
&self,
is_gb300: bool,
is_supermicro_gb300: bool,
) -> Result<Vec<(String, serde_json::Value)>, RedfishError> {
let mut bios_attrs: Vec<(String, serde_json::Value)> = vec![];

if is_gb300 {
// This platform exposes the TPM through the AMI BIOS name.
bios_attrs.push(("SecurityDeviceSupport".into(), "Enabled".into()));
} else {
// Enable TPM.
bios_attrs.push(("TPM".into(), "Enabled".into()));

// Disable EmbeddedUefiShell (infinite boot workaround).
bios_attrs.push(("EmbeddedUefiShell".into(), "Disabled".into()));
}
let mut bios_attrs = machine_setup_bios_attrs(is_supermicro_gb300);
let current_bios_attributes = self.s.bios_attributes().await?;

// Enable Option ROM so that the DPU will show up in the Host's network devce list
// Otherwise, we will never see the DPU's Host PF MAC in the boot option list
if let Some(curr_bios_attributes) = self.s.bios_attributes().await?.as_object() {
if let Some(curr_bios_attributes) = current_bios_attributes.as_object() {
for attribute in curr_bios_attributes.keys() {
if attribute.contains("Pcie6DisableOptionROM") {
bios_attrs.push((attribute.into(), false.into()));
Expand Down Expand Up @@ -1600,6 +1594,20 @@ impl Bmc {
}
}

fn machine_setup_bios_attrs(is_supermicro_gb300: bool) -> Vec<(String, serde_json::Value)> {
if is_supermicro_gb300 {
// Supermicro GB300 exposes TPM through this AMI BIOS attribute.
vec![("SecurityDeviceSupport".into(), "Enabled".into())]
} else {
vec![
// NVIDIA GB200/GB300 exposes TPM directly.
("TPM".into(), "Enabled".into()),
// Disable EmbeddedUefiShell (infinite boot workaround).
("EmbeddedUefiShell".into(), "Disabled".into()),
]
}
}

// UpdateParameters is what is sent for a multipart firmware upload's metadata.
#[derive(Serialize)]
#[serde(rename_all = "PascalCase")]
Expand Down Expand Up @@ -1635,6 +1643,22 @@ impl UpdateParameters {
mod tests {
use super::*;

#[test]
fn gb300_machine_setup_uses_vendor_specific_bios_attributes() {
let dgx_attrs = machine_setup_bios_attrs(false);
assert!(dgx_attrs.contains(&("TPM".into(), "Enabled".into())));
assert!(dgx_attrs.contains(&("EmbeddedUefiShell".into(), "Disabled".into())));
assert!(!dgx_attrs
.iter()
.any(|(key, _)| key == "SecurityDeviceSupport"));

let supermicro_attrs = machine_setup_bios_attrs(true);
assert_eq!(
supermicro_attrs,
vec![("SecurityDeviceSupport".into(), "Enabled".into())]
);
}

#[test]
fn test_update_parameters_targets_all_variants() {
let cases: Vec<(ComponentType, Option<Vec<String>>)> = vec![
Expand Down
4 changes: 4 additions & 0 deletions src/standard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,6 +1412,10 @@ impl RedfishStandard {
Ok(())
}

pub fn is_supermicro(&self) -> bool {
self.service_root.is_supermicro()
}

/// Create client object
pub fn new(client: RedfishHttpClient) -> Self {
Self {
Expand Down
Loading