mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 21:15:45 +00:00
virtio-devices: mem: Handle and propagate errors properly
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
parent
d4d63502be
commit
756aebafda
@ -137,6 +137,8 @@ pub enum Error {
|
|||||||
InvalidDmaMappingHandler,
|
InvalidDmaMappingHandler,
|
||||||
#[error("Not activated by the guest.")]
|
#[error("Not activated by the guest.")]
|
||||||
NotActivatedByGuest,
|
NotActivatedByGuest,
|
||||||
|
#[error("Unknown request type: {0}")]
|
||||||
|
UnkownRequestType(u16),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
@ -309,19 +311,20 @@ impl Request {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn send_response(&self, mem: &GuestMemoryMmap, resp_type: u16, state: u16) -> u32 {
|
fn send_response(
|
||||||
|
&self,
|
||||||
|
mem: &GuestMemoryMmap,
|
||||||
|
resp_type: u16,
|
||||||
|
state: u16,
|
||||||
|
) -> Result<u32, Error> {
|
||||||
let resp = VirtioMemResp {
|
let resp = VirtioMemResp {
|
||||||
resp_type,
|
resp_type,
|
||||||
state,
|
state,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
match mem.write_obj(resp, self.status_addr) {
|
mem.write_obj(resp, self.status_addr)
|
||||||
Ok(_) => size_of::<VirtioMemResp>() as u32,
|
.map_err(Error::GuestMemory)?;
|
||||||
Err(e) => {
|
Ok(size_of::<VirtioMemResp>() as u32)
|
||||||
error!("bad guest memory address: {}", e);
|
|
||||||
0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -588,40 +591,31 @@ impl MemEpollHandler {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_queue(&mut self) -> bool {
|
fn process_queue(&mut self) -> Result<bool, Error> {
|
||||||
let mut used_descs = false;
|
let mut used_descs = false;
|
||||||
|
|
||||||
while let Some(mut desc_chain) = self.queue.pop_descriptor_chain(self.mem.memory()) {
|
while let Some(mut desc_chain) = self.queue.pop_descriptor_chain(self.mem.memory()) {
|
||||||
let len = match Request::parse(&mut desc_chain) {
|
let r = Request::parse(&mut desc_chain)?;
|
||||||
Err(e) => {
|
let len = match r.req.req_type {
|
||||||
error!("failed parse VirtioMemReq: {:?}", e);
|
|
||||||
0
|
|
||||||
}
|
|
||||||
Ok(r) => match r.req.req_type {
|
|
||||||
VIRTIO_MEM_REQ_PLUG => {
|
VIRTIO_MEM_REQ_PLUG => {
|
||||||
let resp_type =
|
let resp_type = self.state_change_request(r.req.addr, r.req.nb_blocks, true);
|
||||||
self.state_change_request(r.req.addr, r.req.nb_blocks, true);
|
r.send_response(desc_chain.memory(), resp_type, 0u16)?
|
||||||
r.send_response(desc_chain.memory(), resp_type, 0u16)
|
|
||||||
}
|
}
|
||||||
VIRTIO_MEM_REQ_UNPLUG => {
|
VIRTIO_MEM_REQ_UNPLUG => {
|
||||||
let resp_type =
|
let resp_type = self.state_change_request(r.req.addr, r.req.nb_blocks, false);
|
||||||
self.state_change_request(r.req.addr, r.req.nb_blocks, false);
|
r.send_response(desc_chain.memory(), resp_type, 0u16)?
|
||||||
r.send_response(desc_chain.memory(), resp_type, 0u16)
|
|
||||||
}
|
}
|
||||||
VIRTIO_MEM_REQ_UNPLUG_ALL => {
|
VIRTIO_MEM_REQ_UNPLUG_ALL => {
|
||||||
let resp_type = self.unplug_all();
|
let resp_type = self.unplug_all();
|
||||||
r.send_response(desc_chain.memory(), resp_type, 0u16)
|
r.send_response(desc_chain.memory(), resp_type, 0u16)?
|
||||||
}
|
}
|
||||||
VIRTIO_MEM_REQ_STATE => {
|
VIRTIO_MEM_REQ_STATE => {
|
||||||
let (resp_type, resp_state) =
|
let (resp_type, resp_state) = self.state_request(r.req.addr, r.req.nb_blocks);
|
||||||
self.state_request(r.req.addr, r.req.nb_blocks);
|
r.send_response(desc_chain.memory(), resp_type, resp_state)?
|
||||||
r.send_response(desc_chain.memory(), resp_type, resp_state)
|
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
error!("VirtioMemReq unknown request type {:?}", r.req.req_type);
|
return Err(Error::UnkownRequestType(r.req.req_type));
|
||||||
0
|
|
||||||
}
|
}
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.queue
|
self.queue
|
||||||
@ -630,7 +624,7 @@ impl MemEpollHandler {
|
|||||||
used_descs = true;
|
used_descs = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
used_descs
|
Ok(used_descs)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
@ -659,7 +653,10 @@ impl EpollHelperHandler for MemEpollHandler {
|
|||||||
EpollHelperError::HandleEvent(anyhow!("Failed to get queue event: {:?}", e))
|
EpollHelperError::HandleEvent(anyhow!("Failed to get queue event: {:?}", e))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
if self.process_queue() {
|
let needs_notification = self.process_queue().map_err(|e| {
|
||||||
|
EpollHelperError::HandleEvent(anyhow!("Failed to process queue : {:?}", e))
|
||||||
|
})?;
|
||||||
|
if needs_notification {
|
||||||
self.signal(VirtioInterruptType::Queue(0)).map_err(|e| {
|
self.signal(VirtioInterruptType::Queue(0)).map_err(|e| {
|
||||||
EpollHelperError::HandleEvent(anyhow!(
|
EpollHelperError::HandleEvent(anyhow!(
|
||||||
"Failed to signal used queue: {:?}",
|
"Failed to signal used queue: {:?}",
|
||||||
|
Loading…
Reference in New Issue
Block a user