From nobody Fri Nov 13 02:38:01 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 4jQhJ95J1Wz6y7fq for ; Fri, 13 Nov 2026 02:38:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQhJ93681z4vYh for ; Fri, 13 Nov 2026 02:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537481; 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=+WuRG1wHrEFq3UWonOsG0D78WDan4W9cBR1lTR8ru34=; b=gX9IedwJ6Ha0mdIHWwwhH6lDpoVlPCTmKEbjo4Cqay3/+oCXULOQqJaSotTRxmH91gka1w uQADTnv5NTheI/7gmqwDL63iChHn/JIgRnAjIBLanN1ftHle6ibLcvb6xQKSQiphF7Thus I9b+lD+Ax5RQIVb4Hk2i8MOQ+h5+/h1sKfhpqIlQGbo25TwrLXlmnrfrXwzSGIHXQqZ2n9 L7m3YH/NsE8NZqpL4nExJHimThsOdSvZHGZDEA/uU9tbyQDtG7skek3XZHTw6qdbaZqbKl CWwmSiaZ9WANriqzNPqz7DAnqeLy1XTIjdssvB8C+M6kpRS4eQXQK6bMXq2zUA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794537481; b=CTkJv0EdVRwQhHmBPSjzAlbUTfafkzNQzikVqid/GBOfA4+NvCXtVCoQ6FNDdBKguHGskG DC2FXxNR4VZGcwrgAmcwxx9No7QkyyfTuYYYOytUZrijjXlps0THA7SNGFQXNsqVKAcCC/ g2ogKLUrlgXo4ktwWkuNioPBmRk89OUKsmU7IilUTGWaLoDz35Au3pJke/VpMyaNfh8H/Q rmfeBcF8QJSWyajCLN3s/2It3qOXbnygrvJYQ612cABdDTciD060HIFeUMhiLcwl7Z7XfA Poe56PQu2gAa0CsJ7ZOkEdVx/uJhTSHAlthdCqqmMBCIvEISxLhx4VRQDhmWkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537481; 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=+WuRG1wHrEFq3UWonOsG0D78WDan4W9cBR1lTR8ru34=; b=CZCU9uJ9mX1/IbIuufperEv9xvHrdRzbbRuUWhyMRcd6Ixh6JZslgVEgUG8Nzb0/1uElTE FD/D3GsmdspEhcJZsP6b6B81iMIzFsDydhTM8vggIV8MTa0BxTwBQTzgyF2FDKZy8QF6/d VqyLSKNA+JQFpF7n5NkMVeZOK7ltqm4oqVqhY61vqooSk3QkIdzMnbCQeTxHxsbr8/DLRt sNYd84v7mVGCEDLkQOIte3DAtC5wMTCSgXwPxOD7OyLJpcdGJP2Aya80jbWdRPbfzS7ji7 pRQktN2I0rgn/ixTSnTiEUhiHFKD+uJeMETfdrzXU2sgx25q/WUG35mJjBEDVA== 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 4jQhJ92THgzFGx for ; Fri, 13 Nov 2026 02:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2186c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 02:38:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b1a743405697 - main - devd: expose maximum record size via sysconf(3) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1a7434056973c5f19b61db2d198a1c92d456efc Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 02:38:01 +0000 Message-Id: <6af67809.2186c.1c3cac8d@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a7434056973c5f19b61db2d198a1c92d456efc commit b1a7434056973c5f19b61db2d198a1c92d456efc Author: Gleb Smirnoff AuthorDate: 2026-11-13 02:37:21 +0000 Commit: Gleb Smirnoff CommitDate: 2026-11-13 02:37:21 +0000 devd: expose maximum record size via sysconf(3) Use UMA allocation size that holds the buffer. The buffer is actually slightly smaller. Document the latter so that clients don't need to use +1 if they later want to NUL-terminate a message. Reviewed by: mjg, imp Differential Revision: https://reviews.freebsd.org/D61346 --- include/unistd.h | 4 +++ lib/libc/gen/sysconf.3 | 10 +++++++- lib/libc/gen/sysconf.c | 7 +++++ sbin/devd/devd.8 | 60 ++++++++++++++++++++++++++++++++++++++----- sbin/devd/tests/client_test.c | 15 ++++------- sys/kern/kern_devctl.c | 9 +++++++ 6 files changed, 88 insertions(+), 17 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index 0bf0bc395161..adb658dc0086 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -312,6 +312,10 @@ typedef __useconds_t useconds_t; #define _SC_NSIG 124 #endif +#if __BSD_VISIBLE +#define _SC_DEVCTL_MAXRECORD 125 +#endif + /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 #define _CS_PATH 1 /* default value of PATH */ diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3 index 290ef0dc158c..ba92e9420262 100644 --- a/lib/libc/gen/sysconf.3 +++ b/lib/libc/gen/sysconf.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 30, 2025 +.Dd November 7, 2026 .Dt SYSCONF 3 .Os .Sh NAME @@ -227,6 +227,14 @@ Note that it is possible that the product of this value and the value of will overflow a .Vt long in some configurations on a 32bit machine. +.It Li _SC_DEVCTL_MAXRECORD +Maximum record size from +.Xr devctl 4 . +See +.Xr devd 8 +and +.Xr devctl 4 +for details. .El .Sh RETURN VALUES If the call to diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index 87aedc07c110..897b1ddad046 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -622,6 +622,13 @@ yesno: case _SC_UEXTERR_MAXLEN: return (UEXTERROR_MAXLEN); + case _SC_DEVCTL_MAXRECORD: + len = sizeof(value); + if (sysctlbyname("hw.bus.devctl_maxrecord", &value, &len, NULL, + 0) == -1) + return (-1); + return ((long)value); + default: errno = EINVAL; return (-1); diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8 index f4e8e173399c..12f3f5bbcc8f 100644 --- a/sbin/devd/devd.8 +++ b/sbin/devd/devd.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 7, 2025 +.Dd November 7, 2026 .Dt DEVD 8 .Os .Sh NAME @@ -131,16 +131,33 @@ wish to hook into the .Nm system without modifying the user's other config files. -.Pp +.Sh CLIENT SOCKET Since .Xr devctl 4 allows only one active reader, .Nm multiplexes it, forwarding all events to any number of connected clients. -Clients connect by opening the SOCK_SEQPACKET -.Ux +Clients connect by opening the +.Dv SOCK_SEQPACKET +.Xr unix 4 domain socket at -.Pa /var/run/devd.seqpacket.pipe . +.Pa /var/run/devd.seqpacket.pipe , +also defined as +.Va _PATH_DEVD_SOCKET +in +.In paths.h . +.Pp +The messages from +.Xr devctl 4 +are copied verbatim to clients. +This implies the newline termination and lack of NUL termination. +The kernel and +.Nm +guarantee that a message shall be of a size less than +.Fn sysconf _SC_DEVCTL_MAXRECORD . +The above features allow a robust client implementation without +a need to take care of a reassembly, see +.Sx EXAMPLES . .Sh FILES .Bl -tag -width ".Pa /var/run/devd.seqpacket.pipe" -compact .It Pa /etc/devd.conf @@ -155,6 +172,36 @@ to communicate with its clients. A deprecated socket retained for use with old clients. .El .Sh EXAMPLES +A trivial client in C: +.Bd -literal -offset indent +#include +#include +#include +#include +#include + +int +main(void) +{ + struct sockaddr_un sun = { + .sun_family = AF_LOCAL, + .sun_path = _PATH_DEVD_SOCKET, + }; + ssize_t len, maxrec = sysconf(_SC_DEVCTL_MAXRECORD); + char event[maxrec]; + int s; + + s = socket(PF_LOCAL, SOCK_SEQPACKET, 0); + connect(s, (struct sockaddr *)&sun, sizeof(sun)); + while ((len = recv(s, event, maxrec, MSG_WAITALL)) > 0) { + event[len] = '\\0'; + printf("%s", event); + } + + return (0); +} +.Ed +.Pp Use .Xr cat 1 to monitor kernel events: @@ -162,7 +209,8 @@ to monitor kernel events: .Dl cat /var/run/devd.seqpacket.pipe .Sh SEE ALSO .Xr devctl 4 , -.Xr devd.conf 5 +.Xr devd.conf 5 , +.Xr sysconf 3 .Sh HISTORY The .Nm diff --git a/sbin/devd/tests/client_test.c b/sbin/devd/tests/client_test.c index f92d40dc9892..a7c15c82a13c 100644 --- a/sbin/devd/tests/client_test.c +++ b/sbin/devd/tests/client_test.c @@ -105,22 +105,17 @@ ATF_TC_BODY(seqpacket, tc) * If we never get both events, then the test will timeout. */ while (!(got_create_event && got_destroy_event)) { - int cmp; - ssize_t len; - char event[1024]; + ssize_t len, maxrec = sysconf(_SC_DEVCTL_MAXRECORD); + char event[maxrec]; - /* Read 1 less than sizeof(event) to allow space for NULL */ - len = recv(s, event, sizeof(event) - 1, MSG_WAITALL); + len = recv(s, event, maxrec, MSG_WAITALL); ATF_REQUIRE(len != -1); - /* NULL terminate the result */ event[len] = '\0'; printf("%s", event); - cmp = strncmp(event, create_pat, sizeof(create_pat) - 1); - if (cmp == 0) + if (strncmp(event, create_pat, sizeof(create_pat) - 1) == 0) got_create_event = true; - cmp = strncmp(event, destroy_pat, sizeof(destroy_pat) - 1); - if (cmp == 0) + if (strncmp(event, destroy_pat, sizeof(destroy_pat) - 1) == 0) got_destroy_event = true; } diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index a37cb23efed8..8a7c720433b9 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -111,6 +111,15 @@ struct dev_event_info { char dei_data[DEVCTL_BUFFER]; }; +/* + * Used by sysconf(_SC_DEVCTL_MAXRECORD). We suggest applications to use a + * slightly bigger buffer than DEVCTL_BUFFER, off just by size of a pointer. + * This is documented and allows applications to utilize this extra space for + * an optional NUL termination. If this structure substantially changes, care + * should be taken to export proper size. + */ +SYSCTL_UINT(_hw_bus, OID_AUTO, devctl_maxrecord, CTLFLAG_RD, + SYSCTL_NULL_UINT_PTR, sizeof(struct dev_event_info), ""); static struct cdevsw dev_cdevsw = { .d_version = D_VERSION,