From nobody Thu Jun 25 17:24:55 2026 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 4gmQfb5D4zz6j39S for ; Thu, 25 Jun 2026 17:24:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfb200tz3J95 for ; Thu, 25 Jun 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408295; 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=cLgouR/5eVYgH4NOVxhzzt++C3uPgwpLCMVRzbMovSw=; b=Fn8sAb26OzMymWehdPgJEaXcCW2i9u2jzAkjoX5Q7U+PXZNtwlIBmgyPoNKEG1+yw1AvnP 7aq9Ms5N8G//oAFnDLP3BP5Um1d+b25GKDijbIG4NU1o8o0gwIF9OgE57cC0oK5L/xLYK2 tKqZKaih0Tjhz4tgC69c5guDT2SK5qr4fKww3qcZFQ3C4af4FCpE7tzSEvUPjFSd871JDS UHhoYtw9pZ/mSTXv1du5rXfhNdpk1G0vOVqC5iKhRUzieMD0cEoKNwE0ovTuYMJesMY0Om mS3pQ957ugxs/vapykIZc3WWLDjlGuQaZsyfe7yX1sRqPnE9vTJs8IYDqreYZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408295; a=rsa-sha256; cv=none; b=Z/n9Fi5WVIgj3w6WluOm07LIUQf3SfA0oxvrnnbLEBWZFuNEFCU8jOk3BuYkc7qbHIFLaw DlsBu5txarOdkru3GCl/T2mAuOYZqCruFjcixsROlHU+NFhCzbZKSw5JlE8SNeBTFFIJgd Uo8Rg3eU0Mg5Ksv7+mSZHSQI3/vfA+5NyUzD0k+a81/G8VySU4sGqoCsOI3TImGJVZajci uOtwqgddufFXOun/t65yfv9aaf/Iik8S8IRQUbqW1PzqMhrOfaJPgIFH3jRVeHR58XrC6s KPH2u8XOEN8/8OzjVGjqJh/833hu1D9d/z9oJUlwx9hvcVKuvKtY3ifJoqQBMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408295; 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=cLgouR/5eVYgH4NOVxhzzt++C3uPgwpLCMVRzbMovSw=; b=UlGPULFQ81mi824tfZoDLcmj9Jridjb4EZ8VNwACqWnvbqTGAfcXnpgNM1ZT7hHxgZOaOD vjwvTpMG+maT/u+sR59x8DHf0nAOJ09KB/+nlDGiCmhQ13TeLeuzNBR4K370OcjAZD8VG1 KsBfF1zaOsLl6yKAo/aNsa+OtKTJFRS+5VKBDREMFrhivTxrmF61MO4jMSEMVlKnrW1JcF 8HmzecD6DUnzl+/x5t4Sgkjgq/fhMBexvIitLATw2Uomrq070UXLzNvNhuBcyf1vZ8DD5z SQyhCsm6Red+Ue22OBZSAsfcDAfMOFT9oqEt1c4kgeMZxKgk5eJ9Rr3g0QWNfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfb148zz1FBv for ; Thu, 25 Jun 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37cd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 777f67d8a9c3 - stable/15 - bhyve: Use a blocking socket in the helper process 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:55 +0000 Message-Id: <6a3d6467.37cd8.5cdaeeba@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 commit 777f67d8a9c3ad8f3b90c378cb5c1754a7d4c554 Author: Mark Johnston AuthorDate: 2025-12-22 19:12:34 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:34:06 +0000 bhyve: Use a blocking socket in the helper process The send_packet callback does not handle EAGAIN, and on the recv side we already use poll() and MSG_DONTWAIT to implement a non-blocking loop. PR: 291616 Tested by: novel Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") Differential Revision: https://reviews.freebsd.org/D54340 (cherry picked from commit daef625cf884dea33d50ad7a0e2da0879a442495) --- usr.sbin/bhyve/slirp/slirp-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index ec0f8a3486e0..36192c590eb1 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -502,6 +502,8 @@ main(int argc, char **argv) memset(&priv, 0, sizeof(priv)); priv.sock = sd; + if (ioctl(priv.sock, FIONBIO, &(int){0}) == -1) + err(1, "ioctl(FIONBIO)"); if (pipe2(priv.wakeup, O_CLOEXEC | O_NONBLOCK) != 0) err(1, "pipe2");