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

virtio-devices: rng: 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:14:06 +01:00 committed by Rob Bradford
parent 7731d2f1be
commit 09f5b82fd7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
virtio-devices/src/rng.rs
View File

@ -21,8 +21,8 @@ use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Barrier}; use std::sync::{Arc, Barrier};
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::{Bytes, GuestMemoryAtomic}; use vm_memory::{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;
@ -40,6 +40,7 @@ struct RngEpollHandler {
queue_evt: EventFd, queue_evt: EventFd,
kill_evt: EventFd, kill_evt: EventFd,
pause_evt: EventFd, pause_evt: EventFd,
access_platform: Option<Arc<dyn AccessPlatform>>,
} }
impl RngEpollHandler { impl RngEpollHandler {
@ -54,10 +55,20 @@ impl RngEpollHandler {
// Drivers can only read from the random device. // Drivers can only read from the random device.
if desc.is_write_only() { if desc.is_write_only() {
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()
};
// Fill the read with data from the random device on the host. // Fill the read with data from the random device on the host.
if desc_chain if desc_chain
.memory() .memory()
.read_from(desc.addr(), &mut self.random_file, desc.len() as usize) .read_from(desc_addr, &mut self.random_file, desc.len() as usize)
.is_ok() .is_ok()
{ {
len = desc.len(); len = desc.len();
@ -230,6 +241,7 @@ impl VirtioDevice for Rng {
queue_evt: queue_evts.remove(0), queue_evt: queue_evts.remove(0),
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();
@ -261,6 +273,10 @@ impl VirtioDevice for Rng {
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 Rng { impl Pausable for Rng {