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: Introduce WorkerThreads handle

Browse Source 
Take the recent thread refactor further. Bundle a device's worker
JoinHandles together with the kill event that stops them into a single
WorkerThreads value, owned by VirtioCommon. Its Drop signals the workers
to exit, unparks any parked for migration, and joins them.

This makes a detached/leaked worker unrepresentable. reset(),
wait_for_epoll_threads() and VhostUserCommon::shutdown() now happen when
dropping the WorkerThreads, and the unpark-before-join teardown now
lives in one place.

Assisted-by: Claude:Opus-4.8
Signed-off-by: Dylan Reid <dgreid@fb.com>
Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Dylan Reid
2026-05-29 20:30:23 -07:00
committed by Rob Bradford
parent 815a1f0801
commit 2bcacbe19d
13 changed files with 158 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,19 +613,8 @@ impl VhostUserCommon {
}
pub fn shutdown(&mut self) {
// Signal workers to exit, unpause them (they may be parked
// if the VM was paused for migration), then wait for them
// to finish so they drop their Arc<VhostUserHandle> and the
// socket fully closes for the destination to reconnect.
if let Some(kill_evt) = self.virtio_common.kill_evt.take() {
let _ = kill_evt.write(1);
}
self.virtio_common.paused.store(false, Ordering::SeqCst);
if let Some(threads) = self.virtio_common.epoll_threads.as_ref() {
for t in threads {
t.thread().unpark();
}
}
// Join the workers so they drop their Arc<VhostUserHandle> and the
// socket closes, letting the migration destination reconnect.
self.virtio_common.wait_for_epoll_threads();
// Remove socket path if needed
@@ -862,8 +851,8 @@ impl VhostUserCommon {
// Make sure the device thread is killed in order to prevent from
// reconnections to the socket.
if let Some(kill_evt) = self.virtio_common.kill_evt.take() {
kill_evt.write(1).map_err(|e| {
if let Some(workers) = self.virtio_common.workers.as_ref() {
workers.signal_exit().map_err(|e| {
MigratableError::CompleteMigration(anyhow!(
"Error killing vhost-user thread: {e:?}"
))