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: Shutdown VMM upon worker thread errors

Browse Source 
Fixes: #4462

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2022-08-11 17:16:27 -07:00
committed by Rob Bradford
parent 8c38992143
commit df5b803a63
14 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
virtio-devices/src/thread_helper.rs
View File

@@ -4,6 +4,7 @@
//
use crate::{
epoll_helper::EpollHelperError,
seccomp_filters::{get_seccomp_filter, Thread},
ActivateError,
};
@@ -23,7 +24,7 @@ pub(crate) fn spawn_virtio_thread<F>(
f: F,
) -> Result<(), ActivateError>
where
F: FnOnce(),
F: FnOnce() -> std::result::Result<(), EpollHelperError>,
F: Send + 'static,
{
let seccomp_filter = get_seccomp_filter(seccomp_action, thread_type)
@@ -44,12 +45,18 @@ where
return;
}
}
std::panic::catch_unwind(AssertUnwindSafe(f))
.or_else(|_| {
match std::panic::catch_unwind(AssertUnwindSafe(f)) {
Err(_) => {
error!("{} thread panicked", thread_name);
thread_exit_evt.write(1)
})
.ok();
thread_exit_evt.write(1).ok();
}
Ok(r) => {
if let Err(e) = r {
error!("Error running worker: {:?}", e);
thread_exit_evt.write(1).ok();
}
}
};
})
.map(|thread| epoll_threads.push(thread))
.map_err(|e| {