External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-21 15:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: iommu: Clarify naming around domains

Browse Source 
In anticipation for associating more than mappings with a domain, we
factorize the list of mappings associated with a domain behind a
dedicated Domain structure. We also update the field name so that it
reads better in the code.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-04-25 17:58:28 +02:00
parent 2f47bea809
commit b40633f92c
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,8 +401,8 @@ impl Request {
mapping.endpoints.write().unwrap().insert(endpoint, domain); mapping.endpoints.write().unwrap().insert(endpoint, domain);
// Add new domain with no mapping if the entry didn't exist yet // Add new domain with no mapping if the entry didn't exist yet
let mut mappings = mapping.mappings.write().unwrap(); let mut domains = mapping.domains.write().unwrap();
mappings.entry(domain).or_insert_with(BTreeMap::new); domains.entry(domain).or_insert_with(Domain::default);
0 0
} }
@ -436,7 +436,7 @@ impl Request {
.count() .count()
== 0 == 0
{ {
mapping.mappings.write().unwrap().remove(&domain); mapping.domains.write().unwrap().remove(&domain);
} }
0 0
@ -475,8 +475,8 @@ impl Request {
} }
// Add new mapping associated with the domain // Add new mapping associated with the domain
if let Some(entry) = mapping.mappings.write().unwrap().get_mut(&domain) { if let Some(entry) = mapping.domains.write().unwrap().get_mut(&domain) {
entry.insert( entry.mappings.insert(
req.virt_start, req.virt_start,
Mapping { Mapping {
gpa: req.phys_start, gpa: req.phys_start,
@ -524,8 +524,8 @@ impl Request {
} }
// Remove mapping associated with the domain // Remove mapping associated with the domain
if let Some(entry) = mapping.mappings.write().unwrap().get_mut(&domain) { if let Some(entry) = mapping.domains.write().unwrap().get_mut(&domain) {
entry.remove(&virt_start); entry.mappings.remove(&virt_start);
} }
0 0
@ -693,12 +693,17 @@ struct Mapping {
size: u64, size: u64,
} }
#[derive(Clone, Debug, Default)]
struct Domain {
mappings: BTreeMap<u64, Mapping>,
}
#[derive(Debug)] #[derive(Debug)]
pub struct IommuMapping { pub struct IommuMapping {
// Domain related to an endpoint. // Domain related to an endpoint.
endpoints: Arc<RwLock<BTreeMap<u32, u32>>>, endpoints: Arc<RwLock<BTreeMap<u32, u32>>>,
// List of mappings per domain. // Information related to each domain.
mappings: Arc<RwLock<BTreeMap<u32, BTreeMap<u64, Mapping>>>>, domains: Arc<RwLock<BTreeMap<u32, Domain>>>,
// Global flag indicating if endpoints that are not attached to any domain // Global flag indicating if endpoints that are not attached to any domain
// are in bypass mode. // are in bypass mode.
bypass: AtomicBool, bypass: AtomicBool,
@ -707,14 +712,17 @@ pub struct IommuMapping {
impl DmaRemapping for IommuMapping { impl DmaRemapping for IommuMapping {
fn translate_gva(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error> { fn translate_gva(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error> {
debug!("Translate GVA addr 0x{:x}", addr); debug!("Translate GVA addr 0x{:x}", addr);
if let Some(domain) = self.endpoints.read().unwrap().get(&id) { if let Some(domain_id) = self.endpoints.read().unwrap().get(&id) {
if let Some(mapping) = self.mappings.read().unwrap().get(domain) { if let Some(domain) = self.domains.read().unwrap().get(domain_id) {
let range_start = if VIRTIO_IOMMU_PAGE_SIZE_MASK > addr { let range_start = if VIRTIO_IOMMU_PAGE_SIZE_MASK > addr {
0 0
} else { } else {
addr - VIRTIO_IOMMU_PAGE_SIZE_MASK addr - VIRTIO_IOMMU_PAGE_SIZE_MASK
}; };
for (&key, &value) in mapping.range((Included(&range_start), Included(&addr))) { for (&key, &value) in domain
.mappings
.range((Included(&range_start), Included(&addr)))
{
if addr >= key && addr < key + value.size { if addr >= key && addr < key + value.size {
let new_addr = addr - key + value.gpa; let new_addr = addr - key + value.gpa;
debug!("Into GPA addr 0x{:x}", new_addr); debug!("Into GPA addr 0x{:x}", new_addr);
@ -734,9 +742,9 @@ impl DmaRemapping for IommuMapping {
fn translate_gpa(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error> { fn translate_gpa(&self, id: u32, addr: u64) -> std::result::Result<u64, std::io::Error> {
debug!("Translate GPA addr 0x{:x}", addr); debug!("Translate GPA addr 0x{:x}", addr);
if let Some(domain) = self.endpoints.read().unwrap().get(&id) { if let Some(domain_id) = self.endpoints.read().unwrap().get(&id) {
if let Some(mapping) = self.mappings.read().unwrap().get(domain) { if let Some(domain) = self.domains.read().unwrap().get(domain_id) {
for (&key, &value) in mapping.iter() { for (&key, &value) in domain.mappings.iter() {
if addr >= value.gpa && addr < value.gpa + value.size { if addr >= value.gpa && addr < value.gpa + value.size {
let new_addr = addr - value.gpa + key; let new_addr = addr - value.gpa + key;
debug!("Into GVA addr 0x{:x}", new_addr); debug!("Into GVA addr 0x{:x}", new_addr);
@ -792,7 +800,7 @@ struct IommuState {
avail_features: u64, avail_features: u64,
acked_features: u64, acked_features: u64,
endpoints: Vec<(u32, u32)>, endpoints: Vec<(u32, u32)>,
mappings: Vec<(u32, Vec<(u64, Mapping)>)>, domains: Vec<(u32, Vec<(u64, Mapping)>)>,
} }
impl VersionMapped for IommuState {} impl VersionMapped for IommuState {}
@ -812,7 +820,7 @@ impl Iommu {
let mapping = Arc::new(IommuMapping { let mapping = Arc::new(IommuMapping {
endpoints: Arc::new(RwLock::new(BTreeMap::new())), endpoints: Arc::new(RwLock::new(BTreeMap::new())),
mappings: Arc::new(RwLock::new(BTreeMap::new())), domains: Arc::new(RwLock::new(BTreeMap::new())),
bypass: AtomicBool::new(true), bypass: AtomicBool::new(true),
}); });
@ -852,14 +860,14 @@ impl Iommu {
.clone() .clone()
.into_iter() .into_iter()
.collect(), .collect(),
mappings: self domains: self
.mapping .mapping
.mappings .domains
.read() .read()
.unwrap() .unwrap()
.clone() .clone()
.into_iter() .into_iter()
.map(|(k, v)| (k, v.into_iter().collect())) .map(|(k, v)| (k, v.mappings.into_iter().collect()))
.collect(), .collect(),
} }
} }
@ -868,11 +876,18 @@ impl Iommu {
self.common.avail_features = state.avail_features; self.common.avail_features = state.avail_features;
self.common.acked_features = state.acked_features; self.common.acked_features = state.acked_features;
*(self.mapping.endpoints.write().unwrap()) = state.endpoints.clone().into_iter().collect(); *(self.mapping.endpoints.write().unwrap()) = state.endpoints.clone().into_iter().collect();
*(self.mapping.mappings.write().unwrap()) = state *(self.mapping.domains.write().unwrap()) = state
.mappings .domains
.clone() .clone()
.into_iter() .into_iter()
.map(|(k, v)| (k, v.into_iter().collect())) .map(|(k, v)| {
(
k,
Domain {
mappings: v.into_iter().collect(),
},
)
})
.collect(); .collect();
} }