Skip to content

Commit 034f3e5

Browse files
authored
Merge pull request #282 from amd/esxi-platform-collectors
Add ESXi support to platform in-band collectors
2 parents 790e2e0 + 3c6584e commit 034f3e5

29 files changed

Lines changed: 2400 additions & 78 deletions

‎nodescraper/plugins/inband/amdsmi/__init__.py‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
# SOFTWARE.
2424
#
2525
###############################################################################
26+
from .amdsmi_flavor_collector import AmdSmiFlavorCollector
27+
from .amdsmi_flavor_plugin import AmdSmiFlavorPlugin
2628
from .amdsmi_plugin import AmdSmiPlugin
29+
from .amdsmidata_flavor import AmdSmiFlavorDataModel
2730

28-
__all__ = ["AmdSmiPlugin"]
31+
__all__ = [
32+
"AmdSmiPlugin",
33+
"AmdSmiFlavorPlugin",
34+
"AmdSmiFlavorCollector",
35+
"AmdSmiFlavorDataModel",
36+
]

‎nodescraper/plugins/inband/amdsmi/amdsmi_flavor_collector.py‎

Lines changed: 579 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from .amdsmi_flavor_collector import AmdSmiFlavorCollector
2+
from .amdsmi_plugin import AmdSmiPlugin
3+
from .amdsmidata_flavor import AmdSmiFlavorDataModel
4+
5+
6+
class AmdSmiFlavorPlugin(AmdSmiPlugin):
7+
"""amd-smi plugin variant with driver-flavor collection.
8+
9+
Detects the loaded driver flavor and issues flavor-appropriate amd-smi commands:
10+
- mxGPU host driver (gim on Linux, amdgpuv on ESXi) -> HostDriver* models
11+
- guest amdgpu on a virtual function inside a VM -> Guest* models
12+
- bare-metal amdgpu on physical hardware -> base AmdSmi* models
13+
Data is built into AmdSmiFlavorDataModel. The base AmdSmiPlugin (guest/bare-metal
14+
only) is left unchanged for callers that do not need host/VF support.
15+
"""
16+
17+
DATA_MODEL = AmdSmiFlavorDataModel # type: ignore[assignment]
18+
COLLECTOR = AmdSmiFlavorCollector
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
"""amd-smi data model that widens the base (guest/bare-metal only) ``AmdSmiDataModel``
2+
field types to also accept the mxGPU host-driver and guest-VF model variants. The
3+
collector picks the concrete model per driver flavor; this model only relaxes the
4+
annotations so those instances are accepted and serialized. The base ``AmdSmiDataModel``
5+
and its consumers are unchanged.
6+
"""
7+
8+
from __future__ import annotations
9+
10+
from typing import Optional, Union
11+
12+
from pydantic import Field
13+
14+
from nodescraper.plugins.inband.amdsmi.amdsmidata import (
15+
AmdSmiDataModel,
16+
AmdSmiListItem,
17+
AmdSmiMetric,
18+
AmdSmiStatic,
19+
AmdSmiVersion,
20+
BadPages,
21+
Topo,
22+
XgmiLinks,
23+
XgmiMetrics,
24+
)
25+
26+
from .amdsmidata_guest import GuestAmdSmiMetric, GuestAmdSmiStatic
27+
from .amdsmidata_host import (
28+
HostDriverAmdSmiListItem,
29+
HostDriverAmdSmiMetric,
30+
HostDriverAmdSmiStatic,
31+
HostDriverAmdSmiVersion,
32+
HostDriverBadPages,
33+
HostDriverTopo,
34+
HostDriverXgmiLinks,
35+
HostDriverXgmiMetrics,
36+
)
37+
38+
39+
class AmdSmiFlavorDataModel(AmdSmiDataModel):
40+
"""AmdSmiDataModel with host/guest driver-flavor model variants allowed."""
41+
42+
# Base (guest/bare-metal) type is listed first; the collector builds the right
43+
# concrete instance per flavor, so widening the annotation is sufficient.
44+
# Widening the base annotations is an intentional LSP override (invariant list),
45+
# so the type: ignore[assignment] markers below are expected.
46+
version: Optional[Union[AmdSmiVersion, HostDriverAmdSmiVersion]] = None # type: ignore[assignment]
47+
gpu_list: Optional[list[Union[AmdSmiListItem, HostDriverAmdSmiListItem]]] = Field( # type: ignore[assignment]
48+
default_factory=list
49+
)
50+
topology: Optional[list[Union[Topo, HostDriverTopo]]] = Field(default_factory=list) # type: ignore[assignment]
51+
bad_pages: Optional[list[Union[BadPages, HostDriverBadPages]]] = Field(default_factory=list) # type: ignore[assignment]
52+
static: Optional[list[Union[AmdSmiStatic, GuestAmdSmiStatic, HostDriverAmdSmiStatic]]] = Field( # type: ignore[assignment]
53+
default_factory=list
54+
)
55+
metric: Optional[list[Union[AmdSmiMetric, GuestAmdSmiMetric, HostDriverAmdSmiMetric]]] = Field( # type: ignore[assignment]
56+
default_factory=list
57+
)
58+
xgmi_metric: Optional[list[Union[XgmiMetrics, HostDriverXgmiMetrics]]] = Field( # type: ignore[assignment]
59+
default_factory=list
60+
)
61+
xgmi_link: Optional[list[Union[XgmiLinks, HostDriverXgmiLinks]]] = Field(default_factory=list) # type: ignore[assignment]
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
"""Guest-VF (virtualized amdgpu) Pydantic models for amd-smi data.
2+
3+
A guest VM sees a single amdgpu virtual function (VF). Its amd-smi build shares
4+
the bare-metal amdgpu JSON schema EXCEPT that a VF does not expose physical /
5+
host-owned fields: fan control, SoC power state, power/thermal limits, NUMA
6+
topology, XGMI power-down policy, and energy/throttle/voltage-curve/perf-level
7+
counters. The bare-metal ``AmdSmi*`` models mark those fields as required, so a
8+
guest payload fails to build against them; these subclasses relax exactly those
9+
fields to optional and inherit all other structure unchanged.
10+
11+
amd-smi was not exercised on the guest before the host/guest driver-flavor work,
12+
so the base ``AmdSmi*`` models had implicitly assumed bare-metal amdgpu.
13+
"""
14+
15+
from __future__ import annotations
16+
17+
from typing import Optional, Union
18+
19+
from pydantic import ConfigDict
20+
21+
from nodescraper.plugins.inband.amdsmi.amdsmidata import (
22+
AmdSmiMetric,
23+
AmdSmiStatic,
24+
MetricEnergy,
25+
MetricFan,
26+
MetricMemUsage,
27+
MetricThrottle,
28+
MetricVoltageCurve,
29+
StaticBus,
30+
StaticLimit,
31+
StaticNuma,
32+
StaticSocPstate,
33+
StaticVbios,
34+
StaticXgmiPlpd,
35+
)
36+
37+
38+
class GuestStaticBus(StaticBus):
39+
"""Guest amd-smi (ROCm 7.14+) adds a per-link ``pcie_levels`` block to the bus
40+
section that the base ``StaticBus`` (``extra="forbid"``) rejects. Ignore unknown
41+
bus fields so a new field doesn't drop the whole static payload, matching the
42+
host models' schema-drift resilience."""
43+
44+
model_config = ConfigDict(extra="ignore")
45+
46+
47+
class GuestAmdSmiStatic(AmdSmiStatic):
48+
"""Bare-metal static schema minus the physical fields a guest VF omits."""
49+
50+
# Base bus (StaticBus) forbids extras; the guest build adds pcie_levels.
51+
bus: GuestStaticBus # type: ignore[assignment]
52+
soc_pstate: Optional[StaticSocPstate] = None
53+
xgmi_plpd: Optional[StaticXgmiPlpd] = None
54+
numa: Optional[StaticNuma] = None # type: ignore[assignment]
55+
limit: Optional[StaticLimit] = None
56+
# A guest VF's static payload carries an ``ifwi`` firmware block (name,
57+
# build_date, part_number, version) that the bare-metal schema omits; its
58+
# shape matches StaticVbios.
59+
ifwi: Optional[StaticVbios] = None
60+
61+
62+
class GuestAmdSmiMetric(AmdSmiMetric):
63+
"""Bare-metal metric schema minus the physical fields a guest VF omits."""
64+
65+
# These physical fields are required on the bare-metal base model; a guest VF
66+
# omits them, so relax to Optional (intentional LSP-widening override).
67+
fan: Optional[MetricFan] = None # type: ignore[assignment]
68+
voltage_curve: Optional[MetricVoltageCurve] = None
69+
perf_level: Optional[Union[str, dict]] = None
70+
xgmi_err: Optional[Union[str, dict]] = None
71+
energy: Optional[MetricEnergy] = None
72+
throttle: Optional[MetricThrottle] = None # type: ignore[assignment]
73+
mem_usage: Optional[MetricMemUsage] = None # type: ignore[assignment]

0 commit comments

Comments
 (0)