From nobody Thu Jan 26 18:54:23 2023 X-Original-To: dev-commits-src-branches@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 4P2qcv3VDTz3bPHy; Thu, 26 Jan 2023 18:54:23 +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 4P2qcv2jPDz465F; Thu, 26 Jan 2023 18:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759263; 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=orW7ZoiS0FGZ/zHvtX4butghqiDtkwRbCBS8rdCcV5A=; b=rW2bx6n3IKGFdN5HMDIjqZV/Bz3Tr7PF3M+rmbyXcj1c6TOJZAXxDHwlpoWjouJndTy7LT h6/schgCAxFm3fT9flwN0YzK1Ym1fu3CZEZUDtKPkZ0hwxI48atOg7lPM53HfjKXo3FDm8 JqiybO0RfXcUgih6SdytJO0NjKU+AMYKzQ5cWgvfQaRU12ThEqCb33hbjlUYUhgfJnQY9A zxy3OnTm0yhiZ2wiTLZrfhWg39nf/YVHSf6i5FbvG6atsixZOt8q0m/ibwDwLKln4YBgQB OVY5Tsb7oPWbS0FBorYVfo7kdyL+D0kX1DCM/6/IyMNQ72Tozgq11cod1+IZaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759263; 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=orW7ZoiS0FGZ/zHvtX4butghqiDtkwRbCBS8rdCcV5A=; b=rn7eB3mIE65U14DFDVUmU4V9VNAzBfhBWGReGN3k9M3pokiNQDZ70ePZFGgnCo4cx4io78 Dw5iiMsEJ9qnOVwqXOTcCFIcJ6GxSSq0qQZ56eQJHo7CKrhXqRTFCbfmG0eFkPtmHU3/0l 5qSP5KetRcCE411MejH9/7UKld4RnJy+8bRL9v6CrJZJUlS+il4/EgqcC4xRlU8BSYj8lk qUGUHnNfHlsCmaW+RRaaTzG1U6vG8iGx/82z8z84tYPgzEPCyQ1IxzJqQHlJlyZtAiW7N5 MnEzm5yP5pu4xd2FVkjbuRht5ImFAIost3J1GOhTu+FUq94jp7givQuq1W4Wsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674759263; a=rsa-sha256; cv=none; b=wvPo5KMr22lNBqyaLqbMlbSQWY4k9/nKFf1XVFhGZz0naDXWw9HcAT4mmvoiWLHlJJDMZX MQBkrtLPQEXTdT7/+fpZxFlvWlC2xNBIhELvPXMxKL1/8qEgCmfeVpRMdl0xuI0YQ07jsm 81Ix0H7kP6AXrdp3gUfQF080BMyzF7sWjeSgibs0ieitJwrEtmr2LsKd8vv1Am5gTdvcXP 7LqRrqqNBAzDOcGOLl+Q4ugO/B/gZVur3tewBEtTm8/Kk7Vr4sDtuRGrgaUH4W+qWeOVcU 45Zy/bucDt0OXKoQ0/FkRxmrwyOD2tyfTaaxMEwxIpvj9gDYIqC+XAy3KT0REw== 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 4P2qcv1f8DzgKw; Thu, 26 Jan 2023 18:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30QIsNbg034135; Thu, 26 Jan 2023 18:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIsNgj034134; Thu, 26 Jan 2023 18:54:23 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:54:23 GMT Message-Id: <202301261854.30QIsNgj034134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 89698430bf83 - stable/13 - bhyve/snapshot: split up mutex/cond initialization from socket creation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 89698430bf833857599ce101cef8147bb1dada18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=89698430bf833857599ce101cef8147bb1dada18 commit 89698430bf833857599ce101cef8147bb1dada18 Author: Robert Wing AuthorDate: 2021-05-15 19:58:21 +0000 Commit: John Baldwin CommitDate: 2023-01-26 18:46:15 +0000 bhyve/snapshot: split up mutex/cond initialization from socket creation Move initialization of the mutex/condition variables required by the save/restore feature to their own function. The unix domain socket that facilitates communication between bhyvectl and bhyve doesn't rely on these variables in order to be functional. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D30281 (cherry picked from commit fdbc86cf79784f56fab8115f2d565962e1111b2e) --- usr.sbin/bhyve/bhyverun.c | 3 +++ usr.sbin/bhyve/snapshot.c | 25 ++++++++++++++++--------- usr.sbin/bhyve/snapshot.h | 1 + 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index c14c0c60837f..48d9a66ea624 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1588,6 +1588,9 @@ main(int argc, char *argv[]) if (restore_file != NULL) destroy_restore_state(&rstate); + /* 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 b70e43adfe2d..b99c8beed2be 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1493,6 +1493,22 @@ checkpoint_thread(void *param) return (NULL); } +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 */ @@ -1508,15 +1524,6 @@ init_checkpoint_thread(struct vmctx *ctx) memset(&addr, 0, sizeof(addr)); - 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) - err = pthread_cond_init(&vcpus_can_run, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init"); - socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0); if (socket_fd < 0) { EPRINTLN("Socket creation failed: %s", strerror(errno)); diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index f28b56cf0a7f..3ffd42fbeabc 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -127,6 +127,7 @@ int vm_resume_user_devs(struct vmctx *ctx); 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);