mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-11 12:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux: use ScopedEvent to trigger the exit_evt in vcpu threads

Browse source 
The VCPU thread can panic when there is a bug, and this should trigger
an exit in crosvm instead of hanging the VCPU thread forever.

BUG=None
TEST=run crosvm with kernel, trigger a vcpu exit using guest

Change-Id: I1df0e04eda73ad67fec20adeff893f6c00699318
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2029929
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
This commit is contained in:
Zach Reizner 2020-01-29 18:06:01 -08:00 committed by Commit Bot
parent 98419968d5
commit 95885316c2
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/linux.rs
View file

@ -50,8 +50,8 @@ use sys_util::{
self, block_signal, clear_signal, drop_capabilities, error, flock, get_blocked_signals, self, block_signal, clear_signal, drop_capabilities, error, flock, get_blocked_signals,
get_group_id, get_user_id, getegid, geteuid, info, register_rt_signal_handler, get_group_id, get_user_id, getegid, geteuid, info, register_rt_signal_handler,
set_cpu_affinity, validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory, set_cpu_affinity, validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory,
Killable, MemoryMappingArena, PollContext, PollToken, Protection, SignalFd, Terminal, TimerFd, Killable, MemoryMappingArena, PollContext, PollToken, Protection, ScopedEvent, SignalFd,
WatchingEvents, SIGRTMIN, Terminal, TimerFd, WatchingEvents, SIGRTMIN,
}; };
use vhost; use vhost;
use vm_control::{ use vm_control::{
@ -1325,6 +1325,10 @@ fn run_vcpu(
thread::Builder::new() thread::Builder::new()
.name(format!("crosvm_vcpu{}", cpu_id)) .name(format!("crosvm_vcpu{}", cpu_id))
.spawn(move || { .spawn(move || {
// The VCPU thread must trigger the `exit_evt` in all paths, and a `ScopedEvent`'s Drop
// implementation accomplishes that.
let _scoped_exit_evt = ScopedEvent::from(exit_evt);
if vcpu_affinity.len() != 0 { if vcpu_affinity.len() != 0 {
if let Err(e) = set_cpu_affinity(vcpu_affinity) { if let Err(e) = set_cpu_affinity(vcpu_affinity) {
error!("Failed to set CPU affinity: {}", e); error!("Failed to set CPU affinity: {}", e);
@ -1336,7 +1340,7 @@ fn run_vcpu(
start_barrier.wait(); start_barrier.wait();
if let Some(vcpu) = vcpu { if let Some(vcpu) = vcpu {
'vcpu_loop: loop { loop {
let mut interrupted_by_signal = false; let mut interrupted_by_signal = false;
match vcpu.run() { match vcpu.run() {
Ok(VcpuExit::IoIn { port, mut size }) => { Ok(VcpuExit::IoIn { port, mut size }) => {
@ -1421,7 +1425,7 @@ fn run_vcpu(
} }
} }
} }
VmRunMode::Exiting => break 'vcpu_loop, VmRunMode::Exiting => return,
} }
// Give ownership of our exclusive lock to the condition variable that // Give ownership of our exclusive lock to the condition variable that
// will block. When the condition variable is notified, `wait` will // will block. When the condition variable is notified, `wait` will
@ -1431,9 +1435,6 @@ fn run_vcpu(
} }
} }
} }
exit_evt
.write(1)
.expect("failed to signal vcpu exit eventfd");
}) })
.map_err(Error::SpawnVcpu) .map_err(Error::SpawnVcpu)
} }