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

pci, vmm: Expose the PCI bus for configuration via MMIO

Browse Source 
Refactor the PCI datastructures to move the device ownership to a PciBus
struct. This PciBus struct can then be used by both a PciConfigIo and
PciConfigMmio in order to expose the configuration space via both IO
port and also via MMIO for PCI MMCONFIG.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2019-09-30 15:23:57 +01:00
parent c0ca3b6b8e
commit 833a3d456c
3 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vmm/src/device_manager.rs
View File

@@ -21,7 +21,8 @@ use libc::{EFD_NONBLOCK, TIOCGWINSZ};
use net_util::Tap;
#[cfg(feature = "pci_support")]
use pci::{
InterruptDelivery, InterruptParameters, PciConfigIo, PciDevice, PciInterruptPin, PciRoot,
InterruptDelivery, InterruptParameters, PciBus, PciConfigIo, PciConfigMmio, PciDevice,
PciInterruptPin, PciRoot,
};
use qcow::{self, ImageType, QcowFile};
@@ -428,7 +429,7 @@ impl DeviceManager {
#[cfg(feature = "pci_support")]
{
let pci_root = PciRoot::new(None);
let mut pci = PciConfigIo::new(pci_root);
let mut pci_bus = PciBus::new(pci_root);
for device in virtio_devices {
DeviceManager::add_virtio_pci_device(
@@ -436,18 +437,32 @@ impl DeviceManager {
vm_info.memory,
allocator,
vm_info.vm_fd,
&mut pci,
&mut pci_bus,
&mut buses,
&interrupt_info,
)?;
}
DeviceManager::add_vfio_devices(
vm_info, allocator, &mut pci, &mut buses, mem_slots,
vm_info,
allocator,
&mut pci_bus,
&mut buses,
mem_slots,
)?;
let pci = Arc::new(Mutex::new(pci));
let pci_bus = Arc::new(Mutex::new(pci_bus));
let pci_config_io = Arc::new(Mutex::new(PciConfigIo::new(pci_bus.clone())));
io_bus
.insert(pci, 0xcf8, 0x8)
.insert(pci_config_io, 0xcf8, 0x8)
.map_err(DeviceManagerError::BusError)?;
let pci_config_mmio = Arc::new(Mutex::new(PciConfigMmio::new(pci_bus)));
mmio_bus
.insert(
pci_config_mmio,
arch::layout::PCI_MMCONFIG_START.0,
arch::layout::PCI_MMCONFIG_SIZE,
)
.map_err(DeviceManagerError::BusError)?;
}
} else if cfg!(feature = "mmio_support") {
@@ -845,7 +860,7 @@ impl DeviceManager {
fn add_vfio_devices(
vm_info: &VmInfo,
allocator: &mut SystemAllocator,
pci: &mut PciConfigIo,
pci: &mut PciBus,
buses: &mut BusInfo,
mem_slots: u32,
) -> DeviceManagerResult<()> {
@@ -889,7 +904,7 @@ impl DeviceManager {
memory: &Arc<RwLock<GuestMemoryMmap>>,
allocator: &mut SystemAllocator,
vm_fd: &Arc<VmFd>,
pci: &mut PciConfigIo,
pci: &mut PciBus,
buses: &mut BusInfo,
interrupt_info: &InterruptInfo,
) -> DeviceManagerResult<()> {