From nobody Thu Jan 26 18:54:33 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 4P2qd53mP7z3bPLW; Thu, 26 Jan 2023 18:54:33 +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 4P2qd5397bz46PG; Thu, 26 Jan 2023 18:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759273; 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=0PjyPvCnnW3fkV9QUod6db5PEeO++VorAwNzMfPnSSo=; b=caU2SktNA+kecy+d0UyD8ti+su8ga1QkvGI9PVbCXeGMUZMjnUGn7WOcBXfA/0papsH1ZC pGdW1dRWQEDxfY5LPYij1hxc+bKL28kMgkPfISKqzvPyGE2+aTczTur0d/qxv8cfPVjMA2 KuOJzok6gEdCCGMvotWpCGGlsdwGIlq8Yi1E9jMrYtJwMYiVFIUzoAkqJP3fKwv+ORU7qG 3QPT15PUVgmAcj/CsC/EP3xXXk64jfghcUqg8NgUy2yB011mRS3w6M10EZtia5bplm/VQI vkt79emIi08/F1bNiz9UtbkTN26hGEq9byWbNGrqgzYmbMR5V7xeq0IICYdUfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759273; 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=0PjyPvCnnW3fkV9QUod6db5PEeO++VorAwNzMfPnSSo=; b=L5kD5pzKrDj69pFPvJ+6/+lGS7zEV8aQ177LP6VC9zyZqPJhQEoB8BoHn/PPXnh6RmP+to 5PGR/5CfB719GF7E8vZ6fPxpvaBtIHgsxi5kaxmXKbbgNSxGbePvKgvU9Bazkpj615sygL gidsgnKX5J/HWrG3rwn9QcfuubYwk0vVZq5xg4crkHh1V6eABRFSrQzv/SWHQeQmrA1zu1 zePOCG3c4lvVa8SeUfx1X/xjG+xSpuVmCJgBbvMxnRlSHdNnUgbR8Olwql9oyUWhNMs5rK ZlsBRWIe6hIvW3x7MP39X8w/rMnrqti0mEUKOyXkOTY2raER3ZY852U9mCSybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674759273; a=rsa-sha256; cv=none; b=qgkxhTUtLSCC/gkRYMjwsGu5his/NJpVwZK6K99RXjqIlBq+fQTNG86nJGMLs5I6aleIH8 tB1d8muCFxNbqEVgigHE7qnluWVB0Zcg1jI0qRW/eI/XR2kQpxnLySoBfFpR3f4N+S54qy ypB4I62hQ1JpLZofFWP4ITwv0bs8O7+SJ5Y9GZ3r4KDTWSZxNYvaqFub8Sz/C+j+c9ciPh kvS1yLxwA8Q1RGofXD/MjeLDmqWejxFsppilcaBaGW/B2ZMH2rpoKGKRRx0HzwNiYljYfM BRJJz5fv6KFELpNHvOa41XMoLolW0qZghNqhuxstu6BJdzIpUHL3ofp/QnN5Ig== 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 4P2qd52BlHzgL0; Thu, 26 Jan 2023 18:54:33 +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 30QIsXxK034371; Thu, 26 Jan 2023 18:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIsXAh034370; Thu, 26 Jan 2023 18:54:33 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:54:33 GMT Message-Id: <202301261854.30QIsXAh034370@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: 10e30f7d8fcb - stable/13 - bhyve/snapshot: ..back to SOCK_STREAM 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: 10e30f7d8fcb45f80b49d656ed75e3bc74605fe7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10e30f7d8fcb45f80b49d656ed75e3bc74605fe7 commit 10e30f7d8fcb45f80b49d656ed75e3bc74605fe7 Author: Robert Wing AuthorDate: 2022-04-28 15:43:01 +0000 Commit: John Baldwin CommitDate: 2023-01-26 18:50:42 +0000 bhyve/snapshot: ..back to SOCK_STREAM Now that nvlist_send()/nvlist_recv() are being used, ditch the datagram socket. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D34863 (cherry picked from commit 690b7ea081790eef2c890f63a4fe7e195cf51df0) --- usr.sbin/bhyve/snapshot.c | 14 +++++++++++--- usr.sbin/bhyvectl/bhyvectl.c | 9 +++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 7c34a9b2f0ea..df09e9f1cb21 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -1450,19 +1450,21 @@ handle_message(struct vmctx *ctx, nvlist_t *nvl) void * checkpoint_thread(void *param) { + int fd; struct checkpoint_thread_info *thread_info; nvlist_t *nvl; pthread_set_name_np(pthread_self(), "checkpoint thread"); thread_info = (struct checkpoint_thread_info *)param; - for (;;) { - nvl = nvlist_recv(thread_info->socket_fd, 0); + while ((fd = accept(thread_info->socket_fd, NULL, NULL)) != -1) { + nvl = nvlist_recv(fd, 0); if (nvl != NULL) handle_message(thread_info->ctx, nvl); else EPRINTLN("nvlist_recv() failed: %s", strerror(errno)); + close(fd); nvlist_destroy(nvl); } @@ -1515,7 +1517,7 @@ init_checkpoint_thread(struct vmctx *ctx) memset(&addr, 0, sizeof(addr)); - socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0); + socket_fd = socket(PF_UNIX, SOCK_STREAM, 0); if (socket_fd < 0) { EPRINTLN("Socket creation failed: %s", strerror(errno)); err = -1; @@ -1536,6 +1538,12 @@ init_checkpoint_thread(struct vmctx *ctx) goto fail; } + if (listen(socket_fd, 10) < 0) { + EPRINTLN("ipc socket listen: %s\n", strerror(errno)); + err = errno; + goto fail; + } + checkpoint_info = calloc(1, sizeof(*checkpoint_info)); checkpoint_info->ctx = ctx; checkpoint_info->socket_fd = socket_fd; diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 06ab05cd48e1..14ab6c7ad33e 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1687,7 +1687,7 @@ send_message(const char *vmname, nvlist_t *nvl) struct sockaddr_un addr; int err, socket_fd; - socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0); + socket_fd = socket(PF_UNIX, SOCK_STREAM, 0); if (socket_fd < 0) { perror("Error creating bhyvectl socket"); err = -1; @@ -1695,11 +1695,12 @@ send_message(const char *vmname, nvlist_t *nvl) } memset(&addr, 0, sizeof(struct sockaddr_un)); + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", + BHYVE_RUN_DIR, vmname); addr.sun_family = AF_UNIX; + addr.sun_len = SUN_LEN(&addr); - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname); - - if (connect(socket_fd, (struct sockaddr *)&addr, SUN_LEN(&addr)) != 0) { + if (connect(socket_fd, (struct sockaddr *)&addr, addr.sun_len) != 0) { perror("connect() failed"); err = errno; goto done;