From nobody Fri Apr 28 07:07:19 2023 X-Original-To: dev-commits-src-main@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 4Q73Zb4DB1z485kG; Fri, 28 Apr 2023 07:07:19 +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 4Q73Zb1dYZz4JFN; Fri, 28 Apr 2023 07:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682665639; 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=Rn97rpypmeEnrm7iOCYgM0/+omqhRlqsZMKJTBSJI1I=; b=L4hs+481+3Lt3WLboABBt3EUQYgSl2IClyeFHKf2HBQ8R7ihP0RVXgb4gX2biRJMkglE5j T4ACLDXfk8tF8uH4p8DU5XeD6UGU6xxGHR5x9RHjWcdcxZ/nbiyqg1cFSz0hwGDMgLzVII 5ZC1otPbftLI9VhbLFMd1gesmnEjebSY3c8FO5w8WztphoiG9gJFlz8W4gtX4blfXCQiHt M+oe7IwTZNlU92dIlBilS7DxHm9AuVX7j0w0dkz9ptqyEBxAOPvixKidVoRNpu0TOvCej+ Hiwo8imjAI/R20Tmy3asKA2xVxuHv2O9DSKQrEq8k+5MR3huc3pMGhLFQLX1fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682665639; 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=Rn97rpypmeEnrm7iOCYgM0/+omqhRlqsZMKJTBSJI1I=; b=XMmUhI2shEoBrZYVAW9IWbcVklpsHQyrRoOKMCslSrUWhOtGt0H1nYIbvcOf63vQtLJxt+ Lgm/ihqp+JuSJYmoUyLnDZ4rwzrOVfBMRYhW/SVPM7nsKVmn+odDATFNjXZPmcmFuqL2Rc jb0GTV+Bwmhbpv1Fy9YO3wHGUSsBYJB3bfpE/1D2gAx+bQC4L3U7a4TNZxb/HugYAFP4Vc U/SHVgnl3maaw/DhUhyB5U5GdgWCtfaUV9LV3aU4bbPt0aVovlRrCF5Kw7LsWUJLVCx2Xn h7UpyQuIt58xtght7n/7m3ykbQ1YJwT2eUOZjg2CQbY+dBDq/rYkSJ0iNE6o/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682665639; a=rsa-sha256; cv=none; b=sLs+8TyRkyj2WoL/h1QkDNh7Y4Q5KT5IoPWncHGeTJ58YnIMIO5NStM3NqtnkZqlT4Q5wx WeaJM/K2URv5sE9F3aRSu3Zqh4rENzItpdOFfYRm4+ur8N076mQnVAajjZWO6BZUyA/zzB cP1dJC0ObIHVXRi2whMoPGr8LBQB0IbaB37MYOsL5FlLwsvhyjXI7qeNtEZowdPDAP5szl hRPw/1K/BcF8g1AVqzn5+vswZuhda4V+dhbJvBJ9QeXUbw/pfMRqw0UFauM+/h/f4aX8Cf DpXVdNmebShqy2v/4gRkeqXCFqgfPKXZaNhlVmvVxAo+eoD5L02SEh+TSa0kgA== 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 4Q73Zb0jwMzqqW; Fri, 28 Apr 2023 07:07:19 +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 33S77J4v037520; Fri, 28 Apr 2023 07:07:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S77JQj037519; Fri, 28 Apr 2023 07:07:19 GMT (envelope-from git) Date: Fri, 28 Apr 2023 07:07:19 GMT Message-Id: <202304280707.33S77JQj037519@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: 18126b647a43 - main - bhyve: use directory file descriptor for checkpoint List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 18126b647a43ff8fbb127cc036084110ac302d32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=18126b647a43ff8fbb127cc036084110ac302d32 commit 18126b647a43ff8fbb127cc036084110ac302d32 Author: Vitaliy Gusev AuthorDate: 2023-04-28 07:00:48 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:00:48 +0000 bhyve: use directory file descriptor for checkpoint This is required to enable capsicum for the snapshot code. Reviewed by: corvink Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38858 --- usr.sbin/bhyve/snapshot.c | 21 ++++++++++++++------- usr.sbin/bhyvectl/bhyvectl.c | 25 +++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 866fc265b8aa..6d543c1b37e3 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1308,9 +1308,10 @@ vm_vcpu_resume(struct vmctx *ctx) } static int -vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) +vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, + bool stop_vm) { - int fd_checkpoint = 0, kdata_fd = 0; + int fd_checkpoint = 0, kdata_fd = 0, fd_meta; int ret = 0; int error = 0; size_t memsz; @@ -1325,14 +1326,14 @@ vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) return (-1); } - kdata_fd = open(kdata_filename, O_WRONLY | O_CREAT | O_TRUNC, 0700); + kdata_fd = openat(fddir, kdata_filename, O_WRONLY | O_CREAT | O_TRUNC, 0700); if (kdata_fd < 0) { perror("Failed to open kernel data snapshot file."); error = -1; goto done; } - fd_checkpoint = open(checkpoint_file, O_RDWR | O_CREAT | O_TRUNC, 0700); + fd_checkpoint = openat(fddir, checkpoint_file, O_RDWR | O_CREAT | O_TRUNC, 0700); if (fd_checkpoint < 0) { perror("Failed to create checkpoint file"); @@ -1346,9 +1347,12 @@ vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) goto done; } - meta_file = fopen(meta_filename, "w"); + fd_meta = openat(fddir, meta_filename, O_WRONLY | O_CREAT | O_TRUNC, 0700); + if (fd_meta != -1) + meta_file = fdopen(fd_meta, "w"); if (meta_file == NULL) { perror("Failed to open vm metadata snapshot file."); + close(fd_meta); goto done; } @@ -1474,10 +1478,13 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) int error; if (!nvlist_exists_string(nvl, "filename") || - !nvlist_exists_bool(nvl, "suspend")) + !nvlist_exists_bool(nvl, "suspend") || + !nvlist_exists_descriptor(nvl, "fddir")) error = EINVAL; else - error = vm_checkpoint(ctx, nvlist_get_string(nvl, "filename"), + error = vm_checkpoint(ctx, + nvlist_get_descriptor(nvl, "fddir"), + nvlist_get_string(nvl, "filename"), nvlist_get_bool(nvl, "suspend")); return (error); diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 5c3440ce8343..12f92eb8d96d 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1711,14 +1711,35 @@ done: } static int -snapshot_request(const char *vmname, const char *file, bool suspend) +open_directory(const char *file) +{ + char *path; + int fd; + + if ((path = strdup(file)) == NULL) + return (-1); + + dirname(path); + fd = open(path, O_DIRECTORY); + free(path); + + return (fd); +} + +static int +snapshot_request(const char *vmname, char *file, bool suspend) { nvlist_t *nvl; + int fd; + + if ((fd = open_directory(file)) < 0) + return (errno); nvl = nvlist_create(0); nvlist_add_string(nvl, "cmd", "checkpoint"); - nvlist_add_string(nvl, "filename", file); + nvlist_add_string(nvl, "filename", basename(file)); nvlist_add_bool(nvl, "suspend", suspend); + nvlist_move_descriptor(nvl, "fddir", fd); return (send_message(vmname, nvl)); }