From nobody Mon Dec 29 14:49:54 2025 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 4dfzf06TTRz6LtmH for ; Mon, 29 Dec 2025 14:50:00 +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 4dfzdz6Q9Cz3s8T for ; Mon, 29 Dec 2025 14:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019800; 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=TgUIkCIsLQl8wjeCY2jKcJp7xfxueGQie0RQxWZKeb1y0IwS6aBVLvJG2mWCR9XWuDiAwc d+IQRH5eY3dFuUuJ58xuMCgsJ4gBl+jzAVmBCBL6zxhcQsoKGq22/hadCNQiJ2xrsmEDsE 2TVehojNN+b1Gbpxswf+w0czOQr2FdbLnFLv1HayhPPhxpXcj9yfUh4I64cEslQZDMWttF 3L9dpauZaoQGanmmRdpzKQydmE4PS2aGPI38klvYpdsA6kRUbrxWpwdw5zQUqvxIiTIAYb eNPen0v1JuVxSEIph54RbRjs8a1v2TZxGdI56IVEn0oni4n3ntfX9nmPQ9DoWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019800; 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=Wvch3pPv1sdfV2sjjXER3AcGvaA7u7vlI/kv00Ds6qCFnbqOa5negkoPhqq85y9vAmVcGP ciB5W3tMimCVU5DyhPzcfhDGBCzPgkIfLsh0ydbWajJL6K88rtMHHuUE+In9kmQiXXKXEi XNGUXtrLAhMp1RnnQxReTw9EFVvTJ0tQy9JfG/W+uY2u3l1pLDaGh3AJt7zT0969NW3vA9 2yWFNpKNuU26UCqHMtM4IUzwGBQ4qRbHT3u4YpxcD5qj6OYTi/4BDd4Ol7NAHPJqGHnwn7 B00rGW/vRjkQc4tU3g3uwpWk9N/HRG3DQoXsy1XK/ZkkrM/1pY9q0lIj6U0a1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767019800; a=rsa-sha256; cv=none; b=o9kVtOApnnnJKXMVktMIzQYI2nXeiKUc92VY2vxzbBfunzyZ4D/AsWyJSDsN60/P21FBja jbM0SQYg2iJUq+eVGcaAn41Mbe2Njx+8iBb4ajr8L8V5Jk8PKRsUU+JzVNDze7y1qy9tWv nBWae1MwaeMDiYW1QCjZKb+KV6xnhae63qTYPSm+appPq8cFZIaCVInJHe9TBq9gDFE/Ry iGM6Fbvxaqet4vo7mqcq3EPfPPXK0Ytmzfpb+VlvAMc6zF3T/bvoPxqf5V5gOqelhXOQ2K IJkXx6W8Ni43+MDd6jJANwCfpXmi9m5myc7/P19kaTenWVPnc2xqFLo1nZnPuA== 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 4dfzdz5GtCz42K for ; Mon, 29 Dec 2025 14:49:59 +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 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 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");