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: vhost_user: skip backend reset when disconnected

Browse Source 
reset() is teardown and must still clean up local state even if the
vhost-user backend has already gone away. When the disconnected flag is
already set, it skips reset_vhost_user() and proceeds with kill-event,
worker-unblock, event logging, and interrupt callback cleanup.

Signed-off-by: Dylan Reid <dgreid@fb.com>
This commit is contained in:
Dylan Reid
2026-05-08 17:27:31 -07:00
committed by Bo Chen
parent 198ab1447d
commit c03e7055cd
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
virtio-devices/src/vhost_user/mod.rs
View File

@@ -10,7 +10,7 @@ use std::{io, thread};
use anyhow::anyhow;
use event_monitor::event;
use log::{error, info};
use log::{error, info, warn};
use serde::{Deserialize, Serialize};
use thiserror::Error;
use vhost::Error as VhostError;
@@ -538,13 +538,24 @@ impl VhostUserCommon {
error!("Failed to resume paused device during reset: {e:?}");
}
if let Some(vu) = &self.vu
// Skip reset_vhost_user if the backend is not connected.
if !self.disconnected.load(Ordering::Relaxed)
&& let Some(vu) = &self.vu
&& let Err(e) = vu.lock().unwrap().reset_vhost_user()
{
error!(
"Failed to reset vhost-user daemon for socket {}: {e:?}",
self.socket_path
);
if e.is_transport_lost() {
warn!(
"Failed to reset vhost-user daemon for socket {}: {e:?}; \
marking device as disconnected",
self.socket_path
);
self.disconnected.store(true, Ordering::Relaxed);
} else {
warn!(
"Failed to reset vhost-user daemon for socket {}: {e:?}",
self.socket_path
);
}
}
if let Some(kill_evt) = self.virtio_common.kill_evt.take() {