github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: fix vfio pci address domain 0001 problem

Browse Source 
Some nvidia gpu pci address domain with 0001,
current runtime default deal with 0000:bdf,
which cause address errors during device initialization
and address conflicts during device registration.

Fixes #11252

Signed-off-by: yangsong <yunya.ys@antgroup.com>
This commit is contained in:
yangsong 2025-05-09 17:28:38 +08:00
parent a286a5aee8
commit 06c7c5bccb
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/runtime-rs/crates/hypervisor/src/device/driver/vfio.rs
View File

@ -165,6 +165,9 @@ pub struct HostDevice {
/// Sysfs path for mdev bus type device
pub sysfs_path: String,
/// PCI device information (Domain)
pub domain: String,
/// PCI device information (BDF): "bus:slot:function"
pub bus_slot_func: String,
@ -342,12 +345,13 @@ impl VfioDevice {
}
// read vendor and deviceor from /sys/bus/pci/devices/BDF/X
fn get_vfio_device_vendor_class(&self, bdf: &str) -> Result<DeviceVendorClass> {
fn get_vfio_device_vendor_class(&self, device_name: &str) -> Result<DeviceVendorClass> {
let device =
get_device_property(bdf, "device").context("get device from syspath failed")?;
get_device_property(device_name, "device").context("get device from syspath failed")?;
let vendor =
get_device_property(bdf, "vendor").context("get vendor from syspath failed")?;
let class = get_device_property(bdf, "class").context("get class from syspath failed")?;
get_device_property(device_name, "vendor").context("get vendor from syspath failed")?;
let class =
get_device_property(device_name, "class").context("get class from syspath failed")?;
Ok(DeviceVendorClass(device, vendor, class))
}
@ -364,10 +368,14 @@ impl VfioDevice {
// It's safe as BDF really exists.
let dev_bdf = vfio_dev_details.0.unwrap();
let dev_vendor_class = self
.get_vfio_device_vendor_class(&dev_bdf)
.get_vfio_device_vendor_class(device_name)
.context("get property device and vendor failed")?;
let parts: Vec<&str> = device_name.splitn(2, ':').collect();
let domain_part = parts.first().context("missing domain segment")?;
let vfio_dev = HostDevice {
domain: domain_part.to_string(),
bus_slot_func: dev_bdf.clone(),
device_vendor_class: Some(dev_vendor_class),
sysfs_path: vfio_dev_details.1,
@ -562,8 +570,10 @@ impl PCIeDevice for VfioDevice {
))?;
hostdev.guest_pci_path = Some(pci_path.clone());
self.device_options
.push(format!("0000:{}={}", hostdev.bus_slot_func, pci_path));
self.device_options.push(format!(
"{}:{}={}",
hostdev.domain, hostdev.bus_slot_func, pci_path
));
}
Ok(())
@ -679,21 +689,23 @@ pub fn bind_device_to_host(bdf: &str, host_driver: &str, _vendor_device_id: &str
// expected format <bus>:<slot>.<func> eg. 02:10.0
fn get_device_bdf(dev_sys_str: String) -> Option<String> {
let dev_sys = dev_sys_str;
if !dev_sys.starts_with("0000:") {
return Some(dev_sys);
}
let parts: Vec<&str> = dev_sys.as_str().splitn(2, ':').collect();
if parts.len() < 2 {
return None;
}
let domain_part = parts.first()?;
if domain_part.len() != 4 {
return Some(dev_sys);
}
parts.get(1).copied().map(|bdf| bdf.to_owned())
}
// expected format <domain>:<bus>:<slot>.<func> eg. 0000:02:10.0
fn normalize_device_bdf(bdf: &str) -> String {
if !bdf.starts_with("0000") {
let parts: Vec<&str> = bdf.split(':').collect();
if parts.len() == 2 {
format!("0000:{}", bdf)
} else {
bdf.to_string()
@ -728,9 +740,7 @@ fn get_mediated_device_bdf(dev_sys_str: String) -> Option<String> {
// dev_sys_path: /sys/bus/pci/devices/DDDD:BB:DD.F
// cfg_path: : /sys/bus/pci/devices/DDDD:BB:DD.F/xxx
fn get_device_property(bdf: &str, property: &str) -> Result<String> {
let device_name = normalize_device_bdf(bdf);
fn get_device_property(device_name: &str, property: &str) -> Result<String> {
let dev_sys_path = Path::new(SYS_BUS_PCI_DEVICES).join(device_name);
let cfg_path = fs::read_to_string(dev_sys_path.join(property)).with_context(|| {
format!(