From nobody Tue Oct 17 18:32:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S92dr5CRjz4xr9s; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S92dr4k2Wz3Bt5; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=cVSFavrwcsp56uaJsxFx2CD3WSR+oCEhMscd2pjT5+FcwkzzH4RwYYXsku3s22A9xUHNuL lOtHMJwAzI942fkLBxI3/VBo1F59Ygb1goMydbTh8lnJMgJviPqNYejkOL2VhzSe2gJdLy yZsmEIMUgqvwN8FrsiNAb6KOp22UvDg+Sp2xkS2G74FRKa15sZSSiXR1XVbAElZ5jZxJLI QP6yDwJehZGga7ayUT37xh2vEBQLMP/8g3gxHfAEV9kAy9NKyV+HSGtmyX+Gh4Vz2YUz8A UyVCHbYX72opjXTUbkx6ymjW6idveqtcpLkBOyhPXbgl1X+s9+CDdZ+/reiEng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697567552; a=rsa-sha256; cv=none; b=y0UCPZAt/VXs844XJk0a2igrsT8JyRzLuA3rND0gVtn0xRbo6L1VSYGVwd0uRSoE5W+eHL LYiQSEnPjyW4ELBjGHuJCKlbZs2DVG9KwGSVJm+vwF1QLYeDfW9/AIDfLcho/g29KWxAMa C72i+skEs9YPU+ICiLUj97eqaB02mdKvFaHpu02DXfq4hL7yLQ/Y3KwxhEG+rXUsOAqWhi SSHvE4sDGWmfhi8yrwKN4QFwLTW9SbzF3kWmWHm7w3NK0kX6vx2Ix300VUeqYFLO1hROyP mYL6MFeRZELag5H0XIdzp4O5ft6siRh5U6WzOE1ZzeDrZTplzv9/zqPUl/wsZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=OW0mZio4Dkal4irHIa0Voclu0SCxnlTYxffoVBmdj2aSDCURKh+rC+7lYGhB8Mfa1++ZMx xG+bz+Mcu1JAmIX1DhCMulVHlbp/CUIl6/DUnr4famUW6vuUGYHtSlEKZlv48aQyCe35KC KzwTUJ3xRjF+0agMsXbL5K7BGs9aIQFEPM3vUbYys9KhaV9kFMyqOTCCfFbzj1ZFlTTBIO ilpwuiVuX9SwUx/zl2kY4HFgWMqYTCxAKDaJn6Z6gn5BVyg4LMSvUdH3SBUSrXI1X3/Ugn /VFd4VU9/1MPQhrdhROyP14kc19fWmyQwLx9V1FNVjOEOHWEQ15fVkN+PpaEjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S92dr3nbkzbZJ; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HIWWu1095930; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HIWWiG095927; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 18:32:32 GMT Message-Id: <202310171832.39HIWWiG095927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7de582874eb9 - main - bhyve: Remove init_snapshot() and initialize static vars List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7de582874eb9d08f3f87d11ed9e2b9ce8306db79 commit 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Author: Vitaliy Gusev AuthorDate: 2023-10-17 14:16:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 18:26:51 +0000 bhyve: Remove init_snapshot() and initialize static vars 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: 9a9a248964696 ("bhyve: init checkput before caph_enter") Reviewed by: markj MFC after: 1 week Sponsored by: vStack --- usr.sbin/bhyve/bhyverun.c | 3 --- usr.sbin/bhyve/snapshot.c | 21 +++------------------ usr.sbin/bhyve/snapshot.h | 1 - 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 0d7f58509244..8147dcd3872b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -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 */ diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5f643c9ceb50..edce55c03eae 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -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 */ diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index 179aafb6471d..8bebdafd6117 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -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);