From nobody Mon Dec 29 14:49:54 2025 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 4dfzdv29hTz6LtdS for ; Mon, 29 Dec 2025 14:49: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfzdt69RKz3sGY for ; Mon, 29 Dec 2025 14:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019795; 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=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=dHLufurLrX1mQDKl1djQ8fhJQ8Two74lcLQUFo1XOfpY0e/WEG+OYTFe/TR+weYanSmstt PTNReTSDfj1vyR0ZUk9wBiwlmv+00TRA3Dw52uYX+KH8WqBdqVtkJrguJWUa5QInRPWXH0 URUUfeKFLVsemTfegle1YrNc0/SIUUl3WcDphmbINPsWrua7wdI0TsyjNfoZJrA1RNngv1 LFEwXBi9l4zs0+2SVRJTvM157EWjWjV750Xz7MgwJKFckSaPZQounZ6ZJzfptofdo02xQW 6t56ihrh9jcn1dJ7iEv0vMKVFkjAYRWojqe4vvNjA02/kaCTKyT79I376DB2uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019795; 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=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=i+ZyYK/JWTtfRysHy6DoHbVHx1X4V1ONaQRoTIFfBvBr53HcFbpHsPQBx5V9z26Mm14hBJ Q1xVgbG2DtEfrCEavjSbVITlMxKWtnAbTVx1mRbrFN9TCVLKc21hEafBxlGmgi5NyfIGGE 3fIWSvZ52FKPXSvhxWlVdWD/7kR+4Kt+gcm+crST9/tRDx9Ct0AIRnWGtHxXTYTIiHSpsS 8ikUg6X9qO1DufTeb6Gxb7Imqg9QWTYuwARfW4vhbhjtFEeC8q/mf7SDvcVy2EJfSw+G00 qJ30NGOfVFM+Wi/5TC+JyKjcEnm2U1cECBXku5uiVJqfbqHsg3uPrdrQ8Gj54Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767019795; a=rsa-sha256; cv=none; b=lq2F8AyMMxhSFw7eR2eTHoYIuuKNYJZfLHTcYs66pWGocjvTMnS4IwrizX5X+gH56NQWq/ YFaGQr6ZhR5LIsl5OCppkIdsIIfqiZezxWHqZrrmLbAuQTMDedzMPk1TFmuo/WIZNIAd1/ uO9T3Fuf1Vwf9uRl/BYhQYIMhJJ0uJRugYREuku2GgUQcXp+WfESN8KWQWmI25yMDOH71N xEbiQgaMr0zfLkgEUic59bk5p4ETgh0OHJ0ayQjCh0ODCi2vKbXT8fMCnKEVtvuxQtUZFY 2sIGBLQLq4OhLdceTsBPKs/mBR+ph2ppBaz9J2Dl57gL1AwuQ0UCMoD3lVSyrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfzdt5GjQz3bL for ; Mon, 29 Dec 2025 14:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 85d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: daef625cf884 - main - bhyve: Use a blocking socket in the helper process 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: daef625cf884dea33d50ad7a0e2da0879a442495 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:49:54 +0000 Message-Id: <69529512.85d8.626d8131@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=daef625cf884dea33d50ad7a0e2da0879a442495 commit daef625cf884dea33d50ad7a0e2da0879a442495 Author: Mark Johnston AuthorDate: 2025-12-22 19:12:34 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:49:24 +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 --- 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 06f393aab724..9fb9784662fe 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -503,6 +503,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");