kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: Size the device config capability per device

Browse Source 
Add a config_size method to VirtioDevice and use it when building the
PCI device configuration capability. The transport advertises the size
reported by the device and omits the capability entirely when the size
is zero, because the virtio driver rejects a zero length capability.

The method defaults to None, so every device keeps its current
capability size.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-06-29 19:14:42 +02:00
committed by Bo Chen
parent 9c085e11bb
commit d1dd6b13d5
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
virtio-devices/src/device.rs
View File

@@ -108,6 +108,10 @@ pub trait VirtioDevice: Send {
let _ = value;
}
fn config_size(&self) -> Option<u64> {
None
}
/// Reads this device configuration space at `offset`.
fn read_config(&self, _offset: u64, _data: &mut [u8]) {
warn!(

29
virtio-devices/src/transport/pci_device.rs
View File

@@ -700,7 +700,10 @@ impl VirtioPciDevice {
.get_bar_addr(VIRTIO_COMMON_BAR_INDEX.into())
}
fn add_pci_capabilities(&mut self) -> result::Result<(), PciDeviceError> {
fn add_pci_capabilities(
&mut self,
device_config_size: u64,
) -> result::Result<(), PciDeviceError> {
// Add pointers to the different configuration structures from the PCI capabilities.
let common_cap = VirtioPciCap::new(
PciCapabilityType::Common,
@@ -722,16 +725,17 @@ impl VirtioPciDevice {
.add_capability(&isr_cap)
.map_err(PciDeviceError::CapabilitiesSetup)?;
// TODO(dgreid) - set based on device's configuration size?
let device_cap = VirtioPciCap::new(
PciCapabilityType::Device,
VIRTIO_COMMON_BAR_INDEX,
DEVICE_CONFIG_BAR_OFFSET as u32,
DEVICE_CONFIG_SIZE as u32,
);
self.configuration
.add_capability(&device_cap)
.map_err(PciDeviceError::CapabilitiesSetup)?;
if device_config_size > 0 {
let device_cap = VirtioPciCap::new(
PciCapabilityType::Device,
VIRTIO_COMMON_BAR_INDEX,
DEVICE_CONFIG_BAR_OFFSET as u32,
device_config_size as u32,
);
self.configuration
.add_capability(&device_cap)
.map_err(PciDeviceError::CapabilitiesSetup)?;
}
let notify_cap = VirtioPciNotifyCap::new(
PciCapabilityType::Notify,
@@ -1096,7 +1100,8 @@ impl PciDevice for VirtioPciDevice {
})?;
// Once the BARs are allocated, the capabilities can be added to the PCI configuration.
self.add_pci_capabilities()?;
let device_config_size = device.config_size().unwrap_or(DEVICE_CONFIG_SIZE);
self.add_pci_capabilities(device_config_size)?;
}
bars.push(bar);