d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve/snapshot: drop mkdir when creating the unix domain socket

Browse Source 
Add /var/run/bhyve/ to BSD.var.dist so we don't have to call mkdir when
creating the unix domain socket for a given bhyve vm.

The path to the unix domain socket for a bhyve vm will now be
/var/run/bhyve/vmname instead of /var/run/bhyve/checkpoint/vmname

Move BHYVE_RUN_DIR from snapshot.c to snapshot.h so it can be shared
to bhyvectl(8).

Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D28783
This commit is contained in:
Robert Wing 2021-02-18 17:48:40 -09:00
parent 811e27fa3c
commit 5ce2d4a1c2
5 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.var.dist
View File

@ -74,6 +74,8 @@
preserve preserve
.. ..
run run
bhyve
..
dhclient dhclient
.. ..
ppp gname=network mode=0770 ppp gname=network mode=0770

4
share/man/man7/hier.7
View File

@ -28,7 +28,7 @@
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" @(#)hier.7 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 9, 2021 .Dd February 22, 2021
.Dt HIER 7 .Dt HIER 7
.Os .Os
.Sh NAME .Sh NAME
@ -832,6 +832,8 @@ system information files describing various info about
system since it was booted system since it was booted
.Pp .Pp
.Bl -tag -width Fl -compact .Bl -tag -width Fl -compact
.It Pa bhyve/
bhyve vm unix domain sockets
.It Pa ppp/ .It Pa ppp/
writable by the writable by the
.Dq network .Dq network

32
usr.sbin/bhyve/snapshot.c
View File

@ -115,8 +115,6 @@ static sig_t old_winch_handler;
#define SNAPSHOT_CHUNK (4 * MB) #define SNAPSHOT_CHUNK (4 * MB)
#define PROG_BUF_SZ (8192) #define PROG_BUF_SZ (8192)
#define BHYVE_RUN_DIR "/var/run/bhyve"
#define CHECKPOINT_RUN_DIR BHYVE_RUN_DIR "/checkpoint"
#define MAX_VMNAME 100 #define MAX_VMNAME 100
#define MAX_MSG_SIZE 1024 #define MAX_MSG_SIZE 1024
@ -1505,26 +1503,6 @@ checkpoint_thread(void *param)
return (NULL); return (NULL);
} }
/*
* Create directory tree to store runtime specific information:
* i.e. UNIX sockets for IPC with bhyvectl.
*/
static int
make_checkpoint_dir(void)
{
int err;
err = mkdir(BHYVE_RUN_DIR, 0755);
if (err < 0 && errno != EEXIST)
return (err);
err = mkdir(CHECKPOINT_RUN_DIR, 0755);
if (err < 0 && errno != EEXIST)
return (err);
return 0;
}
/* /*
* Create the listening socket for IPC with bhyvectl * Create the listening socket for IPC with bhyvectl
*/ */
@ -1556,12 +1534,6 @@ init_checkpoint_thread(struct vmctx *ctx)
goto fail; goto fail;
} }
err = make_checkpoint_dir();
if (err < 0) {
perror("Failed to create checkpoint runtime directory");
goto fail;
}
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
err = vm_get_name(ctx, vmname_buf, MAX_VMNAME - 1); err = vm_get_name(ctx, vmname_buf, MAX_VMNAME - 1);
@ -1570,8 +1542,8 @@ init_checkpoint_thread(struct vmctx *ctx)
goto fail; goto fail;
} }
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s",
CHECKPOINT_RUN_DIR, vmname_buf); BHYVE_RUN_DIR, vmname_buf);
addr.sun_len = SUN_LEN(&addr); addr.sun_len = SUN_LEN(&addr);
unlink(addr.sun_path); unlink(addr.sun_path);

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

@ -42,6 +42,7 @@
#include <libxo/xo.h> #include <libxo/xo.h>
#include <ucl.h> #include <ucl.h>
#define BHYVE_RUN_DIR "/var/run/bhyve/"
#define MAX_SNAPSHOT_VMNAME 100 #define MAX_SNAPSHOT_VMNAME 100
struct vmctx; struct vmctx;

3
usr.sbin/bhyvectl/bhyvectl.c
View File

@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#define NO_ARG no_argument #define NO_ARG no_argument
#define OPT_ARG optional_argument #define OPT_ARG optional_argument
#define CHECKPOINT_RUN_DIR "/var/run/bhyve/checkpoint"
#define MAX_VMNAME 100 #define MAX_VMNAME 100
static const char *progname; static const char *progname;
@ -1708,7 +1707,7 @@ send_checkpoint_op_req(struct vmctx *ctx, struct checkpoint_op *op)
goto done; goto done;
} }
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", CHECKPOINT_RUN_DIR, vmname_buf); snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname_buf);
if (connect(socket_fd, (struct sockaddr *)&addr, if (connect(socket_fd, (struct sockaddr *)&addr,
sizeof(struct sockaddr_un)) != 0) { sizeof(struct sockaddr_un)) != 0) {