mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
vmm: device_manager: Use DeviceTree to store PCI devices
Extend and use the existing DeviceTree to retrieve useful information related to PCI devices. This removes the duplication with pci_devices field which was internal to the DeviceManager. Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
parent
c8c3cad8cb
commit
b06fd80fa9
@ -70,7 +70,7 @@ use pci::{
|
||||
DeviceRelocation, PciBarRegionType, PciBus, PciConfigIo, PciConfigMmio, PciDevice, PciRoot,
|
||||
};
|
||||
use seccomp::SeccompAction;
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::collections::HashMap;
|
||||
use std::convert::TryInto;
|
||||
use std::fs::{read_link, File, OpenOptions};
|
||||
use std::io::{self, sink, stdout, Seek, SeekFrom};
|
||||
@ -825,7 +825,8 @@ impl PtyPair {
|
||||
}
|
||||
}
|
||||
|
||||
enum PciDeviceHandle {
|
||||
#[derive(Clone)]
|
||||
pub enum PciDeviceHandle {
|
||||
#[cfg(feature = "kvm")]
|
||||
Vfio(Arc<Mutex<VfioPciDevice>>),
|
||||
Virtio(Arc<Mutex<VirtioPciDevice>>),
|
||||
@ -900,9 +901,6 @@ pub struct DeviceManager {
|
||||
// Bitmap of PCI devices to hotunplug.
|
||||
pci_devices_down: u32,
|
||||
|
||||
// BTreeMap of PCI b/d/f to their corresponding MetaPciDevice.
|
||||
pci_devices: BTreeMap<u32, (String, PciDeviceHandle)>,
|
||||
|
||||
// List of allocated IRQs for each PCI slot.
|
||||
pci_irq_slots: [u8; 32],
|
||||
|
||||
@ -1007,7 +1005,6 @@ impl DeviceManager {
|
||||
iommu_device: None,
|
||||
pci_devices_up: 0,
|
||||
pci_devices_down: 0,
|
||||
pci_devices: BTreeMap::new(),
|
||||
pci_irq_slots: [0; 32],
|
||||
device_tree,
|
||||
#[cfg(feature = "acpi")]
|
||||
@ -2911,10 +2908,12 @@ impl DeviceManager {
|
||||
pci,
|
||||
vfio_pci_device.clone(),
|
||||
vfio_pci_device.clone(),
|
||||
PciDeviceHandle::Vfio(vfio_pci_device),
|
||||
pci_device_bdf,
|
||||
vfio_name.clone(),
|
||||
)?;
|
||||
|
||||
node.pci_bdf = Some(pci_device_bdf);
|
||||
node.pci_device_handle = Some(PciDeviceHandle::Vfio(vfio_pci_device));
|
||||
|
||||
self.device_tree
|
||||
.lock()
|
||||
.unwrap()
|
||||
@ -2928,9 +2927,7 @@ impl DeviceManager {
|
||||
pci_bus: &mut PciBus,
|
||||
bus_device: Arc<Mutex<dyn BusDevice>>,
|
||||
pci_device: Arc<Mutex<dyn PciDevice>>,
|
||||
pci_device_handle: PciDeviceHandle,
|
||||
bdf: u32,
|
||||
device_id: String,
|
||||
) -> DeviceManagerResult<Vec<(GuestAddress, GuestUsize, PciBarRegionType)>> {
|
||||
let bars = pci_device
|
||||
.lock()
|
||||
@ -2942,7 +2939,6 @@ impl DeviceManager {
|
||||
.add_device(bdf, pci_device)
|
||||
.map_err(DeviceManagerError::AddPciDevice)?;
|
||||
|
||||
self.pci_devices.insert(bdf, (device_id, pci_device_handle));
|
||||
self.bus_devices.push(Arc::clone(&bus_device));
|
||||
|
||||
pci_bus
|
||||
@ -3099,9 +3095,7 @@ impl DeviceManager {
|
||||
pci,
|
||||
virtio_pci_device.clone(),
|
||||
virtio_pci_device.clone(),
|
||||
PciDeviceHandle::Virtio(Arc::clone(&virtio_pci_device)),
|
||||
pci_device_bdf,
|
||||
virtio_device_id,
|
||||
)?;
|
||||
|
||||
let bar_addr = virtio_pci_device.lock().unwrap().config_bar_addr();
|
||||
@ -3122,6 +3116,7 @@ impl DeviceManager {
|
||||
}
|
||||
node.migratable = Some(Arc::clone(&virtio_pci_device) as Arc<Mutex<dyn Migratable>>);
|
||||
node.pci_bdf = Some(pci_device_bdf);
|
||||
node.pci_device_handle = Some(PciDeviceHandle::Virtio(virtio_pci_device));
|
||||
self.device_tree.lock().unwrap().insert(id, node);
|
||||
|
||||
Ok(pci_device_bdf)
|
||||
@ -3167,8 +3162,14 @@ impl DeviceManager {
|
||||
|
||||
// Take care of updating the memory for VFIO PCI devices.
|
||||
#[cfg(feature = "kvm")]
|
||||
for (_, (_, pci_device_handle)) in self.pci_devices.iter() {
|
||||
if let PciDeviceHandle::Vfio(vfio_pci_device) = pci_device_handle {
|
||||
{
|
||||
let device_tree = self.device_tree.lock().unwrap();
|
||||
for pci_device_node in device_tree.pci_devices() {
|
||||
if let PciDeviceHandle::Vfio(vfio_pci_device) = pci_device_node
|
||||
.pci_device_handle
|
||||
.as_ref()
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?
|
||||
{
|
||||
vfio_pci_device
|
||||
.lock()
|
||||
.unwrap()
|
||||
@ -3180,15 +3181,21 @@ impl DeviceManager {
|
||||
.map_err(DeviceManagerError::UpdateMemoryForVfioPciDevice)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn activate_virtio_devices(&self) -> DeviceManagerResult<()> {
|
||||
// Find virtio pci devices and activate any pending ones
|
||||
for (_, (_, pci_device_handle)) in self.pci_devices.iter() {
|
||||
let device_tree = self.device_tree.lock().unwrap();
|
||||
for pci_device_node in device_tree.pci_devices() {
|
||||
#[allow(irrefutable_let_patterns)]
|
||||
if let PciDeviceHandle::Virtio(virtio_pci_device) = pci_device_handle {
|
||||
if let PciDeviceHandle::Virtio(virtio_pci_device) = &pci_device_node
|
||||
.pci_device_handle
|
||||
.as_ref()
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?
|
||||
{
|
||||
virtio_pci_device.lock().unwrap().maybe_activate();
|
||||
}
|
||||
}
|
||||
@ -3246,8 +3253,34 @@ impl DeviceManager {
|
||||
}
|
||||
|
||||
pub fn remove_device(&mut self, id: String) -> DeviceManagerResult<()> {
|
||||
for (pci_device_bdf, (device_id, pci_device_handle)) in self.pci_devices.iter() {
|
||||
if *device_id == id {
|
||||
// The node can be directly a PCI node in case the 'id' refers to a
|
||||
// VFIO device or a virtio-pci one.
|
||||
// In case the 'id' refers to a virtio device, we must find the PCI
|
||||
// node by looking at the parent.
|
||||
let device_tree = self.device_tree.lock().unwrap();
|
||||
let node = device_tree
|
||||
.get(&id)
|
||||
.ok_or(DeviceManagerError::UnknownDeviceId(id))?;
|
||||
|
||||
let pci_device_node = if node.pci_bdf.is_some() && node.pci_device_handle.is_some() {
|
||||
node
|
||||
} else {
|
||||
let parent = node
|
||||
.parent
|
||||
.as_ref()
|
||||
.ok_or(DeviceManagerError::MissingNode)?;
|
||||
device_tree
|
||||
.get(parent)
|
||||
.ok_or(DeviceManagerError::MissingNode)?
|
||||
};
|
||||
|
||||
let pci_device_bdf = pci_device_node
|
||||
.pci_bdf
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?;
|
||||
let pci_device_handle = pci_device_node
|
||||
.pci_device_handle
|
||||
.as_ref()
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?;
|
||||
#[allow(irrefutable_let_patterns)]
|
||||
if let PciDeviceHandle::Virtio(virtio_pci_device) = pci_device_handle {
|
||||
let device_type = VirtioDeviceType::from(
|
||||
@ -3270,21 +3303,9 @@ impl DeviceManager {
|
||||
}
|
||||
|
||||
// Update the PCID bitmap
|
||||
self.pci_devices_down |= 1 << (*pci_device_bdf >> 3);
|
||||
self.pci_devices_down |= 1 << (pci_device_bdf >> 3);
|
||||
|
||||
// Remove the device from the device tree along with its parent.
|
||||
let mut device_tree = self.device_tree.lock().unwrap();
|
||||
if let Some(node) = device_tree.remove(&id) {
|
||||
if let Some(parent) = &node.parent {
|
||||
device_tree.remove(parent);
|
||||
}
|
||||
}
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
Err(DeviceManagerError::UnknownDeviceId(id))
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn eject_device(&mut self, device_id: u8) -> DeviceManagerResult<()> {
|
||||
@ -3304,7 +3325,18 @@ impl DeviceManager {
|
||||
.put_device_id(device_id as usize)
|
||||
.map_err(DeviceManagerError::PutPciDeviceId)?;
|
||||
|
||||
if let Some((_, pci_device_handle)) = self.pci_devices.remove(&pci_device_bdf) {
|
||||
// Remove the device from the device tree along with its children.
|
||||
let mut device_tree = self.device_tree.lock().unwrap();
|
||||
let pci_device_node = device_tree
|
||||
.remove_node_by_pci_bdf(pci_device_bdf)
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?;
|
||||
for child in pci_device_node.children.iter() {
|
||||
device_tree.remove(child);
|
||||
}
|
||||
|
||||
let pci_device_handle = pci_device_node
|
||||
.pci_device_handle
|
||||
.ok_or(DeviceManagerError::MissingPciDevice)?;
|
||||
let (pci_device, bus_device, virtio_device) = match pci_device_handle {
|
||||
#[cfg(feature = "kvm")]
|
||||
PciDeviceHandle::Vfio(vfio_pci_device) => {
|
||||
@ -3328,9 +3360,7 @@ impl DeviceManager {
|
||||
.lock()
|
||||
.unwrap()
|
||||
.remove_dma_mapping_handler(pci_device_bdf)
|
||||
.map_err(
|
||||
DeviceManagerError::RemoveDmaMappingHandlerVirtioMem,
|
||||
)?;
|
||||
.map_err(DeviceManagerError::RemoveDmaMappingHandlerVirtioMem)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3414,11 +3444,7 @@ impl DeviceManager {
|
||||
// buses where it was stored. At the end of this function, after
|
||||
// any_device, bus_device and pci_device are released, the actual
|
||||
// device will be dropped.
|
||||
|
||||
Ok(())
|
||||
} else {
|
||||
Err(DeviceManagerError::MissingPciDevice)
|
||||
}
|
||||
}
|
||||
|
||||
fn hotplug_virtio_pci_device(
|
||||
|
@ -2,6 +2,7 @@
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use crate::device_manager::PciDeviceHandle;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use vm_device::Resource;
|
||||
@ -16,6 +17,8 @@ pub struct DeviceNode {
|
||||
#[serde(skip)]
|
||||
pub migratable: Option<Arc<Mutex<dyn Migratable>>>,
|
||||
pub pci_bdf: Option<u32>,
|
||||
#[serde(skip)]
|
||||
pub pci_device_handle: Option<PciDeviceHandle>,
|
||||
}
|
||||
|
||||
impl DeviceNode {
|
||||
@ -27,6 +30,7 @@ impl DeviceNode {
|
||||
children: Vec::new(),
|
||||
migratable,
|
||||
pci_bdf: None,
|
||||
pci_device_handle: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -72,6 +76,29 @@ impl DeviceTree {
|
||||
pub fn breadth_first_traversal(&self) -> BftIter {
|
||||
BftIter::new(&self.0)
|
||||
}
|
||||
pub fn pci_devices(&self) -> Vec<&DeviceNode> {
|
||||
self.0
|
||||
.values()
|
||||
.filter(|v| v.pci_bdf.is_some() && v.pci_device_handle.is_some())
|
||||
.collect()
|
||||
}
|
||||
pub fn remove_node_by_pci_bdf(&mut self, pci_bdf: u32) -> Option<DeviceNode> {
|
||||
let mut id = None;
|
||||
for (k, v) in self.0.iter() {
|
||||
if let Some(bdf) = v.pci_bdf {
|
||||
if bdf == pci_bdf {
|
||||
id = Some(k.clone());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(id) = &id {
|
||||
self.0.remove(id)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Breadth first traversal iterator.
|
||||
|
Loading…
Reference in New Issue
Block a user