github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-01 22:50:54 +00:00
Code Issues Projects Releases Wiki Activity

agent: Add NUMA-aware PCI path parsing

Browse Source 
Extend pcipath_from_dev_tree_path() to support the full NUMA-aware path
format "root_complex/bus/device" (e.g. "10/00/02") in addition to the
legacy "bus/device" format, defaulting to root complex "00" for backward
compatibility.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
This commit is contained in:
Fabiano Fidêncio
2026-04-14 15:06:33 +02:00
committed by Fabiano Fidêncio
parent 1cbe930fc9
commit 8787da13a9
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/agent/src/linux_abi.rs
View File

@@ -26,15 +26,29 @@ pub fn create_pci_root_bus_path(root_complex: &str) -> String {
format!("/devices/pci0000:{root_complex}")
}
// This is used in several modules, let's create a helper function to parse the
// qom path and switch easily once the shim sends us the full NUMA path
// Parses a device tree path into a (root_complex, PCI path) pair.
//
// Supports two formats:
// - Full NUMA path: "root_complex/bus/device" (e.g. "10/00/02") where the
// first segment is the root complex and the rest form the PCI path.
// - Legacy path: "bus/device" (e.g. "00/02") which defaults to root complex "00".
pub fn pcipath_from_dev_tree_path(dev_tree_path: &str) -> Result<(&str, pci::Path)> {
// Placeholder until the shim send us the full NUMA path
// via shim in the form of root_complex/bus/device 10/00/02
// Currently the shim only sends us the bus/device 00/02
let pci_path = pci::Path::from_str(dev_tree_path)
.with_context(|| format!("Failed to parse PCI path from QOM path '{}'", dev_tree_path))?;
Ok(("00", pci_path))
let segments: Vec<&str> = dev_tree_path.split('/').collect();
if segments.len() >= 3 {
let root_complex = segments[0];
let pci_part = &dev_tree_path[root_complex.len() + 1..];
let pci_path = pci::Path::from_str(pci_part).with_context(|| {
format!(
"Failed to parse PCI path from NUMA path '{}'",
dev_tree_path
)
})?;
Ok((root_complex, pci_path))
} else {
let pci_path = pci::Path::from_str(dev_tree_path)
.with_context(|| format!("Failed to parse PCI path from '{}'", dev_tree_path))?;
Ok(("00", pci_path))
}
}
#[cfg(target_arch = "aarch64")]