NuKVM/libvirt
3
0 Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-10-02 12:20:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: lock domain object while handling monitor events

Browse Source 
virBhyveProcessStop() calls virBhyveDomainObjStopWorker(), which expects
the domain object to be locked. It temporarily releases the lock while
stopping the event thread and acquires it again before returning.

bhyveMonitorIO() called the process stop and restart paths without
holding the domain lock. As a result, the lock acquired by
virBhyveDomainObjStopWorker() was never released, causing subsequent
domain API calls to hang after the guest exited.

Lock the domain object while processing the bhyve process exit event and
release it after the stop or restart operation completes.

Fixes: 0041788857 ("bhyve: clean up event thread")
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Roman Bogorodskiy committed 2026-08-06 18:18:37 +02:00
1 parent c6560a7223
commit 1dc6a8728b
1 file changed
+34 -28
Download Patch File Download Diff File Expand all files Collapse all files
src/bhyve/bhyve_monitor.c
+34 -28
View File
@@ -139,37 +139,43 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque)
return;
}
if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) {
if ((pid_t)kev.ident != vm->pid) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("event from unexpected proc %1$ju!=%2$ju"),
(uintmax_t)vm->pid, (uintmax_t)kev.ident);
return;
}
if (kev.filter != EVFILT_PROC || (kev.fflags & NOTE_EXIT) == 0)
return;
name = vm->def->name;
status = kev.data;
if (WIFSIGNALED(status) && WCOREDUMP(status)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Guest %1$s got signal %2$d and crashed"),
name, WTERMSIG(status));
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, false);
} else if (WIFEXITED(status)) {
if (WEXITSTATUS(status) == 0 || mon->reboot) {
/* 0 - reboot */
VIR_INFO("Guest %s rebooted; restarting domain.", name);
virBhyveProcessRestart(driver, vm);
} else if (WEXITSTATUS(status) < 3) {
/* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */
VIR_INFO("Guest %s shut itself down; destroying domain.", name);
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, false);
} else {
VIR_INFO("Guest %s had an error and exited with status %d; destroying domain.",
name, WEXITSTATUS(status));
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, false);
}
virObjectLock(vm);
if ((pid_t)kev.ident != vm->pid) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("event from unexpected proc %1$ju!=%2$ju"),
(uintmax_t)vm->pid, (uintmax_t)kev.ident);
goto cleanup;
}
name = vm->def->name;
status = kev.data;
if (WIFSIGNALED(status) && WCOREDUMP(status)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Guest %1$s got signal %2$d and crashed"),
name, WTERMSIG(status));
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, false);
} else if (WIFEXITED(status)) {
if (WEXITSTATUS(status) == 0 || mon->reboot) {
/* 0 - reboot */
VIR_INFO("Guest %s rebooted; restarting domain.", name);
virBhyveProcessRestart(driver, vm);
} else if (WEXITSTATUS(status) < 3) {
/* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */
VIR_INFO("Guest %s shut itself down; destroying domain.", name);
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, false);
} else {
VIR_INFO("Guest %s had an error and exited with status %d; destroying domain.",
name, WEXITSTATUS(status));
virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, false);
}
}
cleanup:
virObjectUnlock(vm);
}
static bhyveMonitor *