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

devices: virtio: console: Fix stuck vm when virtio-console has no output

Browse source 
If a virtio-console has type "sink" and the guest keeps writing to it,
the virtio queue would fill and then further writes would block the
guest.

Using an `io::sink` fallback matches the non-async virtio-console's
behavior.

TEST=android microdroid tests
BUG=b:238440998

Change-Id: I145e09052ec8ed166055ad73195c57bf63551efc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3756726
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Frederick Mayle <fmayle@google.com>
This commit is contained in:
Frederick Mayle 2022-07-12 00:52:11 +00:00 committed by Chromeos LUCI
parent f436e27060
commit 500c403a53
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
devices/src/virtio/console/asynchronous.rs
View file

@ -100,7 +100,7 @@ async fn run_rx_queue<I: SignalableInterrupt>(
pub struct ConsoleDevice {
input: Option<AsyncQueueState<AsyncSerialInput>>,
output: Option<AsyncQueueState<Box<dyn io::Write + Send>>>,
output: AsyncQueueState<Box<dyn io::Write + Send>>,
avail_features: u64,
}
@ -162,11 +162,6 @@ impl ConsoleDevice {
doorbell: I,
kick_evt: Event,
) -> anyhow::Result<()> {
let output_queue = match self.output.as_mut() {
Some(output_queue) => output_queue,
None => return Ok(()),
};
let kick_evt =
EventAsync::new(kick_evt, ex).context("Failed to create EventAsync for kick_evt")?;
@ -182,16 +177,11 @@ impl ConsoleDevice {
})
};
output_queue.start(ex, tx_future)
self.output.start(ex, tx_future)
}
pub fn stop_transmit_queue(&mut self) -> AsyncResult<bool> {
if let Some(queue) = self.output.as_mut() {
queue.stop()?;
Ok(true)
} else {
Ok(false)
}
self.output.stop()
}
}
@ -209,7 +199,7 @@ impl SerialDevice for ConsoleDevice {
virtio::base_features(protected_vm) | VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits();
ConsoleDevice {
input: input.map(AsyncSerialInput).map(AsyncQueueState::Stopped),
output: output.map(AsyncQueueState::Stopped),
output: AsyncQueueState::Stopped(output.unwrap_or_else(|| Box::new(io::sink()))),
avail_features,
}
}
@ -353,9 +343,7 @@ impl VirtioDevice for AsyncConsole {
if let Some(input) = console.input.as_mut() {
input.stop().context("failed to stop rx queue")?;
}
if let Some(output) = console.output.as_mut() {
output.stop().context("failed to stop tx queue")?;
}
console.output.stop().context("failed to stop tx queue")?;
Ok(console)
})?