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

virtio-devices: iommu: Fix list of external mappings

Browse Source 
In case an external mapping would have been added after the virtio-iommu
device has been activated, it would have simply be ignored because the
code wasn't using a shared object between the vmm thread and the iommu
thread. This behavior is only triggered on the hotplug codepath, and
only if the hotplugged device is placed behind the virtual IOMMU.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-04-04 16:23:49 +02:00
parent 1cdf8b232d
commit e9b1ad9558
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virtio-devices/src/iommu.rs
View File

@ -20,7 +20,7 @@ use std::ops::Bound::Included;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::result; use std::result;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Barrier, RwLock}; use std::sync::{Arc, Barrier, Mutex, RwLock};
use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize::{VersionMap, Versionize, VersionizeResult};
use versionize_derive::Versionize; use versionize_derive::Versionize;
use virtio_queue::{DescriptorChain, Queue}; use virtio_queue::{DescriptorChain, Queue};
@ -572,7 +572,7 @@ struct IommuEpollHandler {
kill_evt: EventFd, kill_evt: EventFd,
pause_evt: EventFd, pause_evt: EventFd,
mapping: Arc<IommuMapping>, mapping: Arc<IommuMapping>,
ext_mapping: BTreeMap<u32, Arc<dyn ExternalDmaMapping>>, ext_mapping: Arc<Mutex<BTreeMap<u32, Arc<dyn ExternalDmaMapping>>>>,
ext_domain_mapping: BTreeMap<u32, Arc<dyn ExternalDmaMapping>>, ext_domain_mapping: BTreeMap<u32, Arc<dyn ExternalDmaMapping>>,
msi_iova_space: (u64, u64), msi_iova_space: (u64, u64),
} }
@ -585,7 +585,7 @@ impl IommuEpollHandler {
let len = match Request::parse( let len = match Request::parse(
&mut desc_chain, &mut desc_chain,
&self.mapping, &self.mapping,
&self.ext_mapping, &self.ext_mapping.lock().unwrap(),
&mut self.ext_domain_mapping, &mut self.ext_domain_mapping,
self.msi_iova_space, self.msi_iova_space,
) { ) {
@ -751,7 +751,7 @@ pub struct Iommu {
id: String, id: String,
config: VirtioIommuConfig, config: VirtioIommuConfig,
mapping: Arc<IommuMapping>, mapping: Arc<IommuMapping>,
ext_mapping: BTreeMap<u32, Arc<dyn ExternalDmaMapping>>, ext_mapping: Arc<Mutex<BTreeMap<u32, Arc<dyn ExternalDmaMapping>>>>,
seccomp_action: SeccompAction, seccomp_action: SeccompAction,
exit_evt: EventFd, exit_evt: EventFd,
msi_iova_space: (u64, u64), msi_iova_space: (u64, u64),
@ -799,7 +799,7 @@ impl Iommu {
}, },
config, config,
mapping: mapping.clone(), mapping: mapping.clone(),
ext_mapping: BTreeMap::new(), ext_mapping: Arc::new(Mutex::new(BTreeMap::new())),
seccomp_action, seccomp_action,
exit_evt, exit_evt,
msi_iova_space, msi_iova_space,
@ -845,7 +845,7 @@ impl Iommu {
} }
pub fn add_external_mapping(&mut self, device_id: u32, mapping: Arc<dyn ExternalDmaMapping>) { pub fn add_external_mapping(&mut self, device_id: u32, mapping: Arc<dyn ExternalDmaMapping>) {
self.ext_mapping.insert(device_id, mapping); self.ext_mapping.lock().unwrap().insert(device_id, mapping);
} }
} }