External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-04 17:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: mshv: simplify GVA to GPA cache

Browse Source 
So far we've only had the need to emulate one instruction. There is no
need to use a HashMap when a simple tuple for the initial mapping will
do.

We can bring back the HashMap once more sophisticated use cases surface.

No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2021-03-01 15:13:04 +00:00 committed by LIU Wei
parent 3eb5b67dc3
commit 030a86db17
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hypervisor/src/mshv/mod.rs
View File

@ -379,12 +379,9 @@ impl cpu::Vcpu for MshvVcpu {
let mut context = MshvEmulatorContext {
vcpu: self,
addr_map: HashMap::new(),
map: (info.guest_virtual_address, info.guest_physical_address),
};
// Add the GVA <-> GPA mapping.
context.add_mapping(info.guest_virtual_address, info.guest_physical_address);
// Create a new emulator.
let mut emul = Emulator::new(&mut context);
@ -535,24 +532,19 @@ impl cpu::Vcpu for MshvVcpu {
struct MshvEmulatorContext<'a> {
vcpu: &'a MshvVcpu,
addr_map: HashMap<u64, u64>,
map: (u64, u64), // Initial GVA to GPA mapping provided by the hypervisor
}
impl<'a> MshvEmulatorContext<'a> {
// Adds a gva -> gpa mapping into the TLB.
fn add_mapping(&mut self, gva: u64, gpa: u64) {
*self.addr_map.entry(gva).or_insert(gpa) = gpa;
}
// Do the actual gva -> gpa translation
fn translate(&self, gva: u64) -> Result<u64, PlatformError> {
self.addr_map
.get(&gva)
.ok_or_else(|| PlatformError::UnmappedGVA(anyhow!("{:#?}", gva)))
.map(|v| *v)
if self.map.0 == gva {
return Ok(self.map.1);
}
// TODO Check if we could fallback to e.g. an hypercall for doing
// the translation for us.
todo!()
}
}