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

devices: Lock the BtreeMap inside to avoid deadlocks

Browse Source 
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2019-10-23 14:06:13 -07:00
committed by Samuel Ortiz
parent 733e636f02
commit 1870eb4295
4 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vmm/src/device_manager.rs
View File

@@ -168,8 +168,8 @@ pub enum DeviceManagerError {
pub type DeviceManagerResult<T> = result::Result<T, DeviceManagerError>;
struct BusInfo<'a> {
io: &'a mut devices::Bus,
mmio: &'a mut devices::Bus,
io: &'a Arc<devices::Bus>,
mmio: &'a Arc<devices::Bus>,
}
struct InterruptInfo<'a> {
@@ -276,8 +276,8 @@ impl Console {
}
pub struct DeviceManager {
io_bus: devices::Bus,
mmio_bus: devices::Bus,
io_bus: Arc<devices::Bus>,
mmio_bus: Arc<devices::Bus>,
// Console abstraction
console: Arc<Console>,
@@ -306,8 +306,8 @@ impl DeviceManager {
_exit_evt: &EventFd,
reset_evt: &EventFd,
) -> DeviceManagerResult<Self> {
let mut io_bus = devices::Bus::new();
let mut mmio_bus = devices::Bus::new();
let mut io_bus = Arc::new(devices::Bus::new());
let mut mmio_bus = Arc::new(devices::Bus::new());
let mut buses = BusInfo {
io: &mut io_bus,
@@ -1035,8 +1035,13 @@ impl DeviceManager {
pci.add_device(vfio_pci_device.clone())
.map_err(DeviceManagerError::AddPciDevice)?;
pci.register_mapping(vfio_pci_device.clone(), buses.io, buses.mmio, bars)
.map_err(DeviceManagerError::AddPciDevice)?;
pci.register_mapping(
vfio_pci_device.clone(),
buses.io.as_ref(),
buses.mmio.as_ref(),
bars,
)
.map_err(DeviceManagerError::AddPciDevice)?;
}
}
Ok(iommu_attached_device_ids)
@@ -1178,8 +1183,8 @@ impl DeviceManager {
pci.register_mapping(
virtio_pci_device.clone(),
&mut buses.io,
&mut buses.mmio,
buses.io.as_ref(),
buses.mmio.as_ref(),
bars,
)
.map_err(DeviceManagerError::AddPciDevice)?;
@@ -1250,11 +1255,11 @@ impl DeviceManager {
Ok(())
}
pub fn io_bus(&self) -> &devices::Bus {
pub fn io_bus(&self) -> &Arc<devices::Bus> {
&self.io_bus
}
pub fn mmio_bus(&self) -> &devices::Bus {
pub fn mmio_bus(&self) -> &Arc<devices::Bus> {
&self.mmio_bus
}

8
vmm/src/vm.rs
View File

@@ -304,8 +304,8 @@ impl CpuidPatch {
pub struct Vcpu {
fd: VcpuFd,
id: u8,
io_bus: devices::Bus,
mmio_bus: devices::Bus,
io_bus: Arc<devices::Bus>,
mmio_bus: Arc<devices::Bus>,
ioapic: Option<Arc<Mutex<ioapic::Ioapic>>>,
vm_ts: std::time::Instant,
}
@@ -320,8 +320,8 @@ impl Vcpu {
pub fn new(
id: u8,
vm: &Vm,
io_bus: devices::Bus,
mmio_bus: devices::Bus,
io_bus: Arc<devices::Bus>,
mmio_bus: Arc<devices::Bus>,
ioapic: Option<Arc<Mutex<ioapic::Ioapic>>>,
) -> Result<Self> {
let kvm_vcpu = vm.fd.create_vcpu(id).map_err(Error::VcpuFd)?;