From nobody Mon Mar 6 13:05:31 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 4PVf2N1fmqz3wspn; Mon, 6 Mar 2023 13:05: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 4PVf2N106Pz3H7P; Mon, 6 Mar 2023 13:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107932; 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=nzZxqovVevWqo4P1Qqbk7JhjuiXl6Bn5lHjF56OKe/k=; b=E4hQGYhhUp3V5uh6/z0RbJXmRMalhieBIm/e1Plya7ydxgn3ExwEi8FC7Yfy8cz0NZoSyz lQWT6ZczTZXobSHGYsN5tY4CA5+NY9nw7/UmNyX3uqT6Q7wNT7gq10EEaCLLoSlyEOdKUY foFtxltyBU8P0dqO2wP5clcWBMXN+0OAeJNZWabvQ0XdZQi+8PtT5BRH9stzOdiQDviWbw ev9cSBwCwmR96U9KjN0hxD0CtXhqlla47+Yy4F4Fv0ms4jU09oJHLKjOWRCikJLcv0bM0p wr2JtdjcUfdiLAZdYVHTSM0vx/c0qcSPUS6l7/HCV8qb+sKY3PTRuziuh0DgYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107932; 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=nzZxqovVevWqo4P1Qqbk7JhjuiXl6Bn5lHjF56OKe/k=; b=h/TbdNlxOSRbB5r1MBpC2TDOJdiZDu4wnYonJU6BKzBTVtgpH+jwWSzaGAmLHG0CT9YPb8 8GTIulN4JFUuH/KkMBBhna+T9liocyzIuNs6Ab4Qry0INz+7XD/7ayaVIbZaJPO17l56n/ q8SJCTHxeEoQMIly8fKmQNCt0Y/J+AxDxfnMt/RCTKXjypo3SvIJVEVy6SwIjcfNULX4QM w5mZRRqg7JZJEPiOjfKQtVVYyKYgoNNLgfhF/DbCJxMft9ZxXbdFPvmWMqChGe0dwYWLAd I8jk61yS18Ctu1msaQGfmsXKqYRWd+lnxHYYiU5LXOyx0H0njH2QYTEk8NJkZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678107932; a=rsa-sha256; cv=none; b=aclpjRiXGhE8L8kca8AeR7+nO2ONeydwI6vDUMF6wCEukowOckp2CWhP0IMlqU2nkE1ph7 ++5QAzbK8lGeOWxM+ayVzbrmeMX+MiBeivkJPMtpdp7vD8+gp5MyEdgyiyyRQpQu1AWmrQ Bsb+cn/jEy/4flje0Vs0KhZbuwDq/kvL1HS+dtygVdZygglHhzK18GCtyM6+Aka1pn6LJN PrZ/u0CkgbU6xHmT29y2mCkqZUzSZzEXqZ6xz7iPV73NGr5ClIi3ZBEZ22rdRcALcRfF4h dD2WN+1xjatxIzDHWp66LC0uqMYfmWCxQYaTHbgyrPg18ZanDlXMUgTIczJG1Q== 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 4PVf2N02hkz134y; Mon, 6 Mar 2023 13:05:32 +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 326D5VC0079518; Mon, 6 Mar 2023 13:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326D5VnE079517; Mon, 6 Mar 2023 13:05:31 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:05:31 GMT Message-Id: <202303061305.326D5VnE079517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 9a9a24896469 - main - bhyve: init checkput before caph_enter 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a9a248964696f45260ea026aa5f9174cc86b137 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=9a9a248964696f45260ea026aa5f9174cc86b137 commit 9a9a248964696f45260ea026aa5f9174cc86b137 Author: Vitaliy Gusev AuthorDate: 2023-03-06 12:35:21 +0000 Commit: Corvin Köhne CommitDate: 2023-03-06 13:04:21 +0000 bhyve: init checkput before caph_enter init_checkpoint_thread binds to a socket. Bhyve isn't allowed to do that after caph_enter. Reviewed by: corvink, markj MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38857 --- usr.sbin/bhyve/bhyverun.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 0c4aef70b2a9..af4d15666ae3 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1562,6 +1562,17 @@ main(int argc, char *argv[]) */ setproctitle("%s", vmname); +#ifdef BHYVE_SNAPSHOT + /* initialize mutex/cond variables */ + init_snapshot(); + + /* + * checkpointing thread for communication with bhyvectl + */ + if (init_checkpoint_thread(ctx) != 0) + errx(EX_OSERR, "Failed to start checkpoint thread"); +#endif + #ifndef WITHOUT_CAPSICUM caph_cache_catpages(); @@ -1573,15 +1584,6 @@ main(int argc, char *argv[]) #endif #ifdef BHYVE_SNAPSHOT - /* initialize mutex/cond variables */ - init_snapshot(); - - /* - * checkpointing thread for communication with bhyvectl - */ - if (init_checkpoint_thread(ctx) != 0) - errx(EX_OSERR, "Failed to start checkpoint thread"); - if (restore_file != NULL) { destroy_restore_state(&rstate); if (vm_restore_time(ctx) < 0)