fix(pcie): stop misclassifying same-vendor non-GPU devices as GPUs
matchesGPUVendor (sat_overlay.go) matched any PCIe DeviceClass containing the substring "Controller" instead of the actual GPU classes, so a same-vendor non-GPU device (e.g. an NVIDIA-branded NIC/storage controller) with a degraded PCIe link surfaced as a pcie:gpu:<vendor> alarm on the Hardware Summary/webui. isGPUDevice (app_format.go) had the same bug via a different path: an "any NVIDIA-vendor device is a GPU" fallback that could inflate the "GPU: N x <model>" audit summary line with non-GPU companion devices (NVSwitch/NVLink bridges, etc). Both now defer to collector.IsGPUClass (exported from the previously unexported isGPUClass), the canonical exact-match classifier already used by amdgpu.go — removing the duplicated/incorrect class checks instead of reimplementing them. Also dedup two more locally-duplicated classifiers within webui (which doesn't import collector by convention): NIC-class matching (pages.go/page_topo.go) and GPU-class matching in page_validate.go now share one copy per package instead of being reimplemented per file. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
4ac9863353
commit
e3697c0a11
@@ -134,14 +134,11 @@ func isGPUDevice(dev schema.HardwarePCIeDevice) bool {
|
||||
if dev.VendorID != nil && *dev.VendorID == collector.AspeedVendorID {
|
||||
return false
|
||||
}
|
||||
class := trimPtr(dev.DeviceClass)
|
||||
// AMD Instinct / Radeon compute GPUs always carry ProcessingAccelerator or DisplayController.
|
||||
// Do NOT match AMD vendor alone — CPU chipset PCIe devices share that vendor ID.
|
||||
if class == "VideoController" || class == "DisplayController" || class == "ProcessingAccelerator" {
|
||||
return true
|
||||
}
|
||||
// NVIDIA devices sometimes expose class values outside the standard GPU set.
|
||||
return dev.VendorID != nil && *dev.VendorID == collector.NvidiaVendorID
|
||||
// AMD Instinct / Radeon and NVIDIA compute GPUs always carry VideoController,
|
||||
// DisplayController, or ProcessingAccelerator. Do NOT match vendor ID alone —
|
||||
// same-vendor companion devices (NVSwitch/NVLink bridges, CPU chipset PCIe
|
||||
// functions, ...) share the GPU's vendor ID without being a GPU die.
|
||||
return collector.IsGPUClass(trimPtr(dev.DeviceClass))
|
||||
}
|
||||
|
||||
func formatSystemLine(board schema.HardwareBoard) string {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"bee/audit/internal/schema"
|
||||
)
|
||||
|
||||
// TestFormatGPULineIgnoresNonGPUSameVendorDevice guards the bug where
|
||||
// isGPUDevice treated any NVIDIA-vendor PCIe device as a GPU regardless of
|
||||
// class (a fallback for "NVIDIA devices sometimes expose class values
|
||||
// outside the standard GPU set"). That fallback misclassified same-vendor
|
||||
// companion devices — e.g. NVSwitch/NVLink bridges, or an NVIDIA-branded NIC
|
||||
// — as compute GPUs, inflating the "GPU: N x <model>" audit summary line.
|
||||
func TestFormatGPULineIgnoresNonGPUSameVendorDevice(t *testing.T) {
|
||||
vendor := 0x10de // collector.NvidiaVendorID
|
||||
bridgeClass := "Bridge"
|
||||
bridgeModel := "NVSwitch"
|
||||
gpuClass := "VideoController"
|
||||
gpuModel := "H100"
|
||||
|
||||
devices := []schema.HardwarePCIeDevice{
|
||||
{DeviceClass: &bridgeClass, VendorID: &vendor, Model: &bridgeModel},
|
||||
{DeviceClass: &gpuClass, VendorID: &vendor, Model: &gpuModel},
|
||||
}
|
||||
|
||||
got := formatGPULine(devices)
|
||||
want := "GPU: 1 x H100"
|
||||
if got != want {
|
||||
t.Fatalf("formatGPULine() = %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
@@ -391,6 +391,38 @@ func TestWritePCIeGPUStatusesToDBSurfacesLinkSpeedDegradation(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestWritePCIeGPUStatusesToDBIgnoresNonGPUSameVendorDevice guards the bug
|
||||
// where a PCIe link-speed degradation on a non-GPU device that merely shares
|
||||
// the GPU's PCI vendor ID (e.g. an NVIDIA-branded NIC/storage/NVLink-bridge
|
||||
// companion device) was misclassified as a GPU fault and surfaced as a
|
||||
// pcie:gpu:<vendor> alarm, because matchesGPUVendor matched any class
|
||||
// containing the substring "Controller" instead of the actual GPU classes.
|
||||
func TestWritePCIeGPUStatusesToDBIgnoresNonGPUSameVendorDevice(t *testing.T) {
|
||||
db, err := OpenComponentStatusDB(filepath.Join(t.TempDir(), "component-status.json"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
class := "NetworkController"
|
||||
vendor := 0x10de // collector.NvidiaVendorID
|
||||
status := "Warning"
|
||||
desc := "PCIe link speed degraded: running at Gen1, capable of Gen5"
|
||||
devices := []schema.HardwarePCIeDevice{
|
||||
{
|
||||
HardwareComponentStatus: schema.HardwareComponentStatus{Status: &status, ErrorDescription: &desc},
|
||||
DeviceClass: &class,
|
||||
VendorID: &vendor,
|
||||
BDF: strPtr("0000:02:00.0"),
|
||||
},
|
||||
}
|
||||
|
||||
writePCIeGPUStatusesToDB(db, devices)
|
||||
|
||||
if _, ok := db.Get("pcie:gpu:nvidia"); ok {
|
||||
t.Fatal("expected non-GPU same-vendor device to not write pcie:gpu:nvidia")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunNCCLTestsPassesSelectedGPUs(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
||||
@@ -340,9 +340,7 @@ func matchesGPUVendor(dev schema.HardwarePCIeDevice, vendor string) bool {
|
||||
return false
|
||||
}
|
||||
class := strings.TrimSpace(*dev.DeviceClass)
|
||||
isGPUClass := strings.Contains(class, "Controller") || strings.Contains(class, "Accelerator") ||
|
||||
strings.Contains(class, "Display") || strings.Contains(class, "Video")
|
||||
if !isGPUClass {
|
||||
if !collector.IsGPUClass(class) {
|
||||
return false
|
||||
}
|
||||
switch vendor {
|
||||
|
||||
Reference in New Issue
Block a user