External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 19:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Attach VFIO devices to IORT table

Browse Source 
This patch attaches VFIO devices to the virtual IOMMU if they are
identified as they should be, based on the option "iommu=on". This
simply takes care of adding the PCI device ID to the ACPI IORT table.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2019-10-07 09:28:03 -07:00 committed by Samuel Ortiz
parent 5fc3f37c9b
commit 9085a39c7d
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vmm/src/device_manager.rs
View File

@ -45,8 +45,8 @@ use vm_memory::{Address, GuestMemoryMmap, GuestUsize};
use vm_virtio::transport::VirtioPciDevice; use vm_virtio::transport::VirtioPciDevice;
use vm_virtio::vhost_user::VhostUserConfig; use vm_virtio::vhost_user::VhostUserConfig;
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
use vm_virtio::{DmaRemapping, VirtioIommuRemapping}; use vm_virtio::{DmaRemapping, IommuMapping, VirtioIommuRemapping};
use vm_virtio::{IommuMapping, VirtioSharedMemory, VirtioSharedMemoryList}; use vm_virtio::{VirtioSharedMemory, VirtioSharedMemoryList};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
#[cfg(feature = "mmio_support")] #[cfg(feature = "mmio_support")]
@ -518,11 +518,7 @@ impl DeviceManager {
} }
} }
if let Some(iommu_id) = iommu_id { let mut iommu_attached_vfio_devices = DeviceManager::add_vfio_devices(
virt_iommu = Some((iommu_id, iommu_attached_devices));
}
DeviceManager::add_vfio_devices(
vm_info, vm_info,
allocator, allocator,
&mut pci_bus, &mut pci_bus,
@ -530,6 +526,12 @@ impl DeviceManager {
mem_slots, mem_slots,
)?; )?;
iommu_attached_devices.append(&mut iommu_attached_vfio_devices);
if let Some(iommu_id) = iommu_id {
virt_iommu = Some((iommu_id, iommu_attached_devices));
}
let pci_bus = Arc::new(Mutex::new(pci_bus)); let pci_bus = Arc::new(Mutex::new(pci_bus));
let pci_config_io = Arc::new(Mutex::new(PciConfigIo::new(pci_bus.clone()))); let pci_config_io = Arc::new(Mutex::new(PciConfigIo::new(pci_bus.clone())));
io_bus io_bus
@ -980,14 +982,26 @@ impl DeviceManager {
pci: &mut PciBus, pci: &mut PciBus,
buses: &mut BusInfo, buses: &mut BusInfo,
mem_slots: u32, mem_slots: u32,
) -> DeviceManagerResult<()> { ) -> DeviceManagerResult<Vec<u32>> {
let mut mem_slot = mem_slots; let mut mem_slot = mem_slots;
let mut iommu_attached_list = Vec::new();
if let Some(device_list_cfg) = &vm_info.vm_cfg.devices { if let Some(device_list_cfg) = &vm_info.vm_cfg.devices {
// Create the KVM VFIO device // Create the KVM VFIO device
let device_fd = DeviceManager::create_kvm_device(vm_info.vm_fd)?; let device_fd = DeviceManager::create_kvm_device(vm_info.vm_fd)?;
let device_fd = Arc::new(device_fd); let device_fd = Arc::new(device_fd);
for device_cfg in device_list_cfg.iter() { for device_cfg in device_list_cfg.iter() {
// We need to shift the device id since the 3 first bits
// are dedicated to the PCI function, and we know we don't
// do multifunction. Also, because we only support one PCI
// bus, the bus 0, we don't need to add anything to the
// global device ID.
let device_id = pci.next_device_id() << 3;
if device_cfg.iommu {
iommu_attached_list.push(device_id);
}
let vfio_device = let vfio_device =
VfioDevice::new(&device_cfg.path, device_fd.clone(), vm_info.memory.clone()) VfioDevice::new(&device_cfg.path, device_fd.clone(), vm_info.memory.clone())
.map_err(DeviceManagerError::VfioCreate)?; .map_err(DeviceManagerError::VfioCreate)?;
@ -1012,7 +1026,7 @@ impl DeviceManager {
.map_err(DeviceManagerError::AddPciDevice)?; .map_err(DeviceManagerError::AddPciDevice)?;
} }
} }
Ok(()) Ok(iommu_attached_list)
} }
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]