External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 11:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: console: Handle descriptor address translation

Browse Source 
Since we're trying to move away from the translation happening in the
virtio-queue crate, the device itself is performing the address
translation when needed.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-01-26 17:11:18 +01:00 committed by Rob Bradford
parent 3e1ce98d1a
commit ce984b73f5
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
virtio-devices/src/console.rs
View File

@ -24,8 +24,8 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::{Arc, Barrier, Mutex}; use std::sync::{Arc, Barrier, Mutex};
use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize::{VersionMap, Versionize, VersionizeResult};
use versionize_derive::Versionize; use versionize_derive::Versionize;
use virtio_queue::Queue; use virtio_queue::{AccessPlatform, Queue};
use vm_memory::{ByteValued, Bytes, GuestMemoryAtomic}; use vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemoryAtomic};
use vm_migration::VersionMapped; use vm_migration::VersionMapped;
use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable}; use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
@ -85,6 +85,7 @@ struct ConsoleEpollHandler {
resize_pipe: Option<File>, resize_pipe: Option<File>,
kill_evt: EventFd, kill_evt: EventFd,
pause_evt: EventFd, pause_evt: EventFd,
access_platform: Option<Arc<dyn AccessPlatform>>,
} }
pub enum Endpoint { pub enum Endpoint {
@ -145,9 +146,20 @@ impl ConsoleEpollHandler {
let desc = desc_chain.next().unwrap(); let desc = desc_chain.next().unwrap();
let len = cmp::min(desc.len() as u32, in_buffer.len() as u32); let len = cmp::min(desc.len() as u32, in_buffer.len() as u32);
let source_slice = in_buffer.drain(..len as usize).collect::<Vec<u8>>(); let source_slice = in_buffer.drain(..len as usize).collect::<Vec<u8>>();
let desc_addr = if let Some(access_platform) = &self.access_platform {
GuestAddress(
access_platform
.translate(desc.addr().0, u64::from(desc.len()))
.unwrap(),
)
} else {
desc.addr()
};
if let Err(e) = desc_chain if let Err(e) = desc_chain
.memory() .memory()
.write_slice(&source_slice[..], desc.addr()) .write_slice(&source_slice[..], desc_addr)
{ {
error!("Failed to write slice: {:?}", e); error!("Failed to write slice: {:?}", e);
avail_iter.go_to_previous_position(); avail_iter.go_to_previous_position();
@ -184,9 +196,19 @@ impl ConsoleEpollHandler {
for mut desc_chain in trans_queue.iter().unwrap() { for mut desc_chain in trans_queue.iter().unwrap() {
let desc = desc_chain.next().unwrap(); let desc = desc_chain.next().unwrap();
if let Some(ref mut out) = self.endpoint.out_file() { if let Some(ref mut out) = self.endpoint.out_file() {
let desc_addr = if let Some(access_platform) = &self.access_platform {
GuestAddress(
access_platform
.translate(desc.addr().0, u64::from(desc.len()))
.unwrap(),
)
} else {
desc.addr()
};
let _ = desc_chain let _ = desc_chain
.memory() .memory()
.write_to(desc.addr(), out, desc.len() as usize); .write_to(desc_addr, out, desc.len() as usize);
let _ = out.flush(); let _ = out.flush();
} }
used_desc_heads[used_count] = (desc_chain.head_index(), desc.len()); used_desc_heads[used_count] = (desc_chain.head_index(), desc.len());
@ -513,6 +535,7 @@ impl VirtioDevice for Console {
resizer: Arc::clone(&self.resizer), resizer: Arc::clone(&self.resizer),
kill_evt, kill_evt,
pause_evt, pause_evt,
access_platform: self.common.access_platform.clone(),
}; };
let paused = self.common.paused.clone(); let paused = self.common.paused.clone();
@ -543,6 +566,10 @@ impl VirtioDevice for Console {
event!("virtio-device", "reset", "id", &self.id); event!("virtio-device", "reset", "id", &self.id);
result result
} }
fn set_access_platform(&mut self, access_platform: Arc<dyn AccessPlatform>) {
self.common.set_access_platform(access_platform)
}
} }
impl Pausable for Console { impl Pausable for Console {