system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 16:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: Remove init_snapshot() and initialize static vars

Browse source 
vCPU threads are starting before init_snapshot() is called. That can lead
to corruption of vcpu_lock userspace mutex (snapshot.c) and then VM hangs
in acquiring that mutex.

init_snapshot() initializes only static variables (mutex, cv) and that
code can be optimized and removed.

Fixes:		9a9a248964 ("bhyve: init checkput before caph_enter")
Reviewed by:	markj
MFC after:	1 week
Sponsored by:	vStack
This commit is contained in:
Vitaliy Gusev 2023-10-17 14:16:08 +00:00 committed by Mark Johnston
parent 2ee2890249
commit 7de582874e
3 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/bhyve/bhyverun.c
View file

@ -1021,9 +1021,6 @@ main(int argc, char *argv[])
setproctitle("%s", vmname);
#ifdef BHYVE_SNAPSHOT
/* initialize mutex/cond variables */
init_snapshot();
/*
* checkpointing thread for communication with bhyvectl
*/

21
usr.sbin/bhyve/snapshot.c
View file

@ -137,8 +137,9 @@ static const struct vm_snapshot_kern_info snapshot_kern_structs[] = {
};
static cpuset_t vcpus_active, vcpus_suspended;
static pthread_mutex_t vcpu_lock;
static pthread_cond_t vcpus_idle, vcpus_can_run;
static pthread_mutex_t vcpu_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t vcpus_idle = PTHREAD_COND_INITIALIZER;
static pthread_cond_t vcpus_can_run = PTHREAD_COND_INITIALIZER;
static bool checkpoint_active;
/*
@ -1395,22 +1396,6 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl)
}
IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint);
void
init_snapshot(void)
{
int err;
err = pthread_mutex_init(&vcpu_lock, NULL);
if (err != 0)
errc(1, err, "checkpoint mutex init");
err = pthread_cond_init(&vcpus_idle, NULL);
if (err != 0)
errc(1, err, "checkpoint cv init (vcpus_idle)");
err = pthread_cond_init(&vcpus_can_run, NULL);
if (err != 0)
errc(1, err, "checkpoint cv init (vcpus_can_run)");
}
/*
* Create the listening socket for IPC with bhyvectl
*/

1
usr.sbin/bhyve/snapshot.h
View file

@ -100,7 +100,6 @@ int vm_resume_devices(void);
int get_checkpoint_msg(int conn_fd, struct vmctx *ctx);
void *checkpoint_thread(void *param);
int init_checkpoint_thread(struct vmctx *ctx);
void init_snapshot(void);
int load_restore_file(const char *filename, struct restore_state *rstate);