External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-04 17:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Shutdown VMM if signal thread panics

Browse Source 
See: #3031

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-09-08 15:35:52 +01:00 committed by Bo Chen
parent e0d05683ab
commit d64a77a5c6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vmm/src/vm.rs
View File

@ -63,6 +63,7 @@ use std::io::{self, Read, Write};
use std::io::{Seek, SeekFrom}; use std::io::{Seek, SeekFrom};
use std::num::Wrapping; use std::num::Wrapping;
use std::ops::Deref; use std::ops::Deref;
use std::panic::AssertUnwindSafe;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
use std::{result, str, thread}; use std::{result, str, thread};
use vm_device::Bus; use vm_device::Bus;
@ -1592,7 +1593,7 @@ impl Vm {
mut signals: Signals, mut signals: Signals,
console_input_clone: Arc<Console>, console_input_clone: Arc<Console>,
on_tty: bool, on_tty: bool,
exit_evt: EventFd, exit_evt: &EventFd,
) { ) {
for sig in HANDLED_SIGNALS { for sig in HANDLED_SIGNALS {
unblock_signal(sig).unwrap(); unblock_signal(sig).unwrap();
@ -1820,11 +1821,18 @@ impl Vm {
.map_err(Error::ApplySeccompFilter) .map_err(Error::ApplySeccompFilter)
{ {
error!("Error applying seccomp filter: {:?}", e); error!("Error applying seccomp filter: {:?}", e);
exit_evt.write(1).ok();
return; return;
} }
} }
std::panic::catch_unwind(AssertUnwindSafe(|| {
Vm::os_signal_handler(signals, console, on_tty, exit_evt); Vm::os_signal_handler(signals, console, on_tty, &exit_evt);
}))
.map_err(|_| {
error!("signal_handler thead panicked");
exit_evt.write(1).ok()
})
.ok();
}) })
.map_err(Error::SignalHandlerSpawn)?, .map_err(Error::SignalHandlerSpawn)?,
); );