From nobody Mon Dec 1 16:38:07 2025 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 4dKqMh19t7z6Jryq for ; Mon, 01 Dec 2025 16:38:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKqMg6VVZz3d3G for ; Mon, 01 Dec 2025 16:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjCnJpUPIYnOhQCnW+5oJe2FZl7l1sZs6ZoiyDlo2qI=; b=cXNOOQHBsmG+0pFGT7+5wFuH6qkFzkq1/dbvA/9hf5yV2+S0g4Dd+URnPtRXjfyL4+VSKZ J0paBfu+is/5ZXuM8cLooSG1VjsvuoD43aFfyd53zl6hIWZQn8nbhsBxgL3nK7zJKkRnSy yrs8JyN5e7su4INZBcz2WWh4LOrbgv19wiEVnxEPUV2e6+Il7MAHPZuTDqs12xn8GLg+7c XPtjsfLqjh/Mi8Vc9aWxP+iCgX5Dk22EZLxgwUm4hj8jT92C4OgraKEuKaSRHoAb0QutL4 4YqJ3a8fN8f7a+tn1bp8w/s98FAI/RA/CGQOYspBNcOrM2aVcsseDPfEtiPuLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjCnJpUPIYnOhQCnW+5oJe2FZl7l1sZs6ZoiyDlo2qI=; b=MO8Fr77q/IBvmh/SFHJ/JpMqdt8ZspC29Cf0ewUaCb+ahGuUrcEvpaNGGW+FzGMaO6EF0D /4CeN2FrqRXGhCbR9dATofdvVXBELoxzBtFk3ZmmkM8LLrqjnjJWOS6aFS+hTg3AVMo2Kd zEmKg7ZVpES1F6OWvLWxa32FCZxu3wzoYhVAgzkYiz7DgLQ1O2pSRULDDCmw8AsOz177eK HwkKOjCtl+aKZk7D7ttQUoaJJSmxw1tSxC+mCCYt1uLgynwo/ixmGnoQ/4B/nsm01YOqmb 8REq+myNBmHMCyF+bsu0ud1dpl6qIdmgFS24xQ++cgmA8IFoMdE2LmpwuJL3aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764607087; a=rsa-sha256; cv=none; b=X4PIy/t5gLpj+LA/ECsHAoMgt4hC/FCs88DYmcJkjTKNiuBLItC03+BTmjvhrjEt7Ua7Yp wu1T1xumv1oeKXxNF46GLx/iWUaTSZtS0fZUyoVgw+qXaGPQOGARkLp10t0A26tXxpQecb +I2R2x6OeWWtdfrVphxz4Q+IKqi5VVanBOODrawvFjUZB2D7UIccsv5jxpGQB1Z9PFuCN7 0awNfHumQAeJm7U+tIfESL1UWUwzKQNnd7onsynqS/M4ZbvJiHAOHGTZ4yhxxONq/OwP/G nv4X4ND/j4iJIyaiZEYvDKP9uZzX7ZJe2SsS3A8K4SisWcoqCCUMqoyF+mRSug== 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 4dKqMg613MzCpd for ; Mon, 01 Dec 2025 16:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ac8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 16:38:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Mark Johnston Subject: git: 57e4e7d12598 - stable/15 - ng_device: enable setting the device to non-blocking mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 57e4e7d125983779d96e3a4fddcad1b5495349f8 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 16:38:07 +0000 Message-Id: <692dc46f.37ac8.72b106dd@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57e4e7d125983779d96e3a4fddcad1b5495349f8 commit 57e4e7d125983779d96e3a4fddcad1b5495349f8 Author: Quentin Thébault AuthorDate: 2025-08-28 08:19:41 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 16:37:57 +0000 ng_device: enable setting the device to non-blocking mode Return success when FIONBIO or FIOASYNC ioctl are received in order to support being set to non-blocking through fcntl(2). We return an error on FIOASYNC with non-zero data argument since we do not support O_ASYNC. Signed-off-by: Quentin Thébault Reviewed by: imp, jhb Pull Request: https://github.com/freebsd/freebsd-src/pull/1827 (cherry picked from commit 9fadaee7ecce02ab11cfbb18ea63b9bf1fb11bfc) --- sys/netgraph/ng_device.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c index 79cae9933a5a..eca3a916a59f 100644 --- a/sys/netgraph/ng_device.c +++ b/sys/netgraph/ng_device.c @@ -38,20 +38,21 @@ #endif #include +#include #include +#include +#include +#include #include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include @@ -135,9 +136,7 @@ static d_close_t ngdclose; static d_open_t ngdopen; static d_read_t ngdread; static d_write_t ngdwrite; -#if 0 static d_ioctl_t ngdioctl; -#endif static d_poll_t ngdpoll; static struct cdevsw ngd_cdevsw = { @@ -146,9 +145,7 @@ static struct cdevsw ngd_cdevsw = { .d_close = ngdclose, .d_read = ngdread, .d_write = ngdwrite, -#if 0 .d_ioctl = ngdioctl, -#endif .d_poll = ngdpoll, .d_name = NG_DEVICE_DEVNAME, }; @@ -397,6 +394,36 @@ ngdclose(struct cdev *dev, int flag, int mode, struct thread *td) return(0); } +/* + * Process IOCTLs + * + * At this stage we only return success on FIONBIO to allow setting the device + * as non-blocking. + * + */ +static int +ngdioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, + struct thread *td) +{ + int error; + + switch (cmd) { + case FIONBIO: + error = 0; + break; + case FIOASYNC: + if (*(int *)data != 0) + error = EINVAL; + else + error = 0; + break; + default: + error = ENOTTY; + } + + return (error); +} + #if 0 /* * The ioctl is transformed into netgraph control message. * We do not process them, yet.