kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: console: Propagate GuestMemory errors properly

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2022-10-25 17:10:01 -07:00
committed by Sebastien Boeuf
parent da1ab77848
commit a5d0ff7039
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio-devices/src/console.rs
+25 -17
View File
@@ -27,7 +27,7 @@ use std::sync::{Arc, Barrier, Mutex};
use thiserror::Error; use thiserror::Error;
use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize::{VersionMap, Versionize, VersionizeResult};
use versionize_derive::Versionize; use versionize_derive::Versionize;
use virtio_queue::{Queue, QueueOwnedT, QueueT}; use virtio_queue::{Queue, QueueT};
use vm_memory::{ByteValued, Bytes, GuestAddressSpace, GuestMemoryAtomic}; use vm_memory::{ByteValued, Bytes, GuestAddressSpace, 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};
@@ -57,6 +57,12 @@ const VIRTIO_CONSOLE_F_SIZE: u64 = 0;
enum Error { enum Error {
#[error("Descriptor chain too short")] #[error("Descriptor chain too short")]
DescriptorChainTooShort, DescriptorChainTooShort,
#[error("Failed to read from guest memory: {0}")]
GuestMemoryRead(vm_memory::guest_memory::Error),
#[error("Failed to write to guest memory: {0}")]
GuestMemoryWrite(vm_memory::guest_memory::Error),
#[error("Failed to flush output: {0}")]
OutputFlush(io::Error),
#[error("Failed to add used index: {0}")] #[error("Failed to add used index: {0}")]
QueueAddUsed(virtio_queue::Error), QueueAddUsed(virtio_queue::Error),
} }
@@ -227,15 +233,14 @@ impl ConsoleEpollHandler {
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>>();
if let Err(e) = desc_chain.memory().write_slice( desc_chain
&source_slice[..], .memory()
desc.addr() .write_slice(
.translate_gva(self.access_platform.as_ref(), desc.len() as usize), &source_slice[..],
) { desc.addr()
error!("Failed to write slice: {:?}", e); .translate_gva(self.access_platform.as_ref(), desc.len() as usize),
recv_queue.go_to_previous_position(); )
break; .map_err(Error::GuestMemoryWrite)?;
}
recv_queue recv_queue
.add_used(desc_chain.memory(), desc_chain.head_index(), len) .add_used(desc_chain.memory(), desc_chain.head_index(), len)
@@ -264,13 +269,16 @@ impl ConsoleEpollHandler {
while let Some(mut desc_chain) = trans_queue.pop_descriptor_chain(self.mem.memory()) { while let Some(mut desc_chain) = trans_queue.pop_descriptor_chain(self.mem.memory()) {
let desc = desc_chain.next().ok_or(Error::DescriptorChainTooShort)?; let desc = desc_chain.next().ok_or(Error::DescriptorChainTooShort)?;
if let Some(out) = &mut self.out { if let Some(out) = &mut self.out {
let _ = desc_chain.memory().write_to( desc_chain
desc.addr() .memory()
.translate_gva(self.access_platform.as_ref(), desc.len() as usize), .write_to(
out, desc.addr()
desc.len() as usize, .translate_gva(self.access_platform.as_ref(), desc.len() as usize),
); out,
let _ = out.flush(); desc.len() as usize,
)
.map_err(Error::GuestMemoryRead)?;
out.flush().map_err(Error::OutputFlush)?;
} }
trans_queue trans_queue
.add_used(desc_chain.memory(), desc_chain.head_index(), desc.len()) .add_used(desc_chain.memory(), desc_chain.head_index(), desc.len())