From nobody Mon Jan 26 12:02:02 2026 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 4f06bG2zDZz6QBNb for ; Mon, 26 Jan 2026 12:02:02 +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 4f06bG2K0Nz3bPc for ; Mon, 26 Jan 2026 12:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769428922; 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=dLtkH0bInsadNDoxjWzOYrg8ihv193LrVs87jRhTWdw=; b=rl9pNviC54lBvewyvxHA+Ug/MRw1JSExJU6PIlYlFsHbfa/7m14TTIM8WDwV0mK7lU0zKB kmtx65gAepGVFC6MWEnJjg7qqbWNNxDOtkkO9rxNwZACioU4LbI9p5cbjfQHJ24vsA8h8h L5ep7ku9xZfRVhz6Fth7sQ3rGnzYZEK9RnjIvhL6xAcrA1YuS+G3paudbodbz7QXRlsgqf Eo3/vi1TPcB/pZ6ofXMbCOqA5g+l1BsQULTmVoknCxEbdd3tK1MMsOo2SwmjLJvpO6GjYs gVkR8zUOr+WFYS9FUJNuToAcmd1Qar+hNpUkOI8o8cxF/iMMH9iUKnm6QoiM8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769428922; 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=dLtkH0bInsadNDoxjWzOYrg8ihv193LrVs87jRhTWdw=; b=BKPMOo3dy99V0SnTJl8R9fz2LDot1kwtmpsQLfjfo3eg6NxUBwohtiPDyseEwJQPae2Km5 YTBagnVVtoXXnoXwW/HgL8rRB5dY4a75bDcMRdTFd3iTQKD6W+COIYiiRQ/leD5mtJuq9J Onk9YM3hyVr/5KJrxKvLnzU9zFekYBQL3OdWb+LdSiXvcLiAf9R/hx+gMe+9YuMCh27S2m Zt+RdmcN948NtndvAGnIzuWTr9ScwlQP6v00NgDrAuWLutUH2OFOi5p+a4EGj5RZwCHfPd zQhyBBfOmkvyiWtTYBHV+j4MwlHdizr7iKYZpx5tPQsd6WGuqOEOtTv+lXPdIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769428922; a=rsa-sha256; cv=none; b=Crv2vX2pGnvQLHxtPlhXrK6zRbLz5TTwXph+Cjxh1zxLHtpRUCC8guu9Hch9JfkdjIE4IZ nvkVaP9fmRYfE4nSWmSo/UZRABJJBn9ip5T7xqQg0KL7K/UOt8mHstYWWBYEW74gONHU96 KwcgiE/6v3iUTKERReKNx6cYlKJkpry1X0lIF0BIK8sRpjaLpGZpSWJaByBL8EDXXXV6lp FEeyDogL2zF2Lqs+OKhLsqH749TaQApdtyH3N+cvtTjlbNlaCcQr4u4TyaiHdqQ7KfTkEZ 5Fy9lKB5pAwAMcgIpzTQzWRPv6wyOP+ofk4GdCIsZ+hS/uLtZQtUUeM1HAvShQ== 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 4f06bG1wW4z4bK for ; Mon, 26 Jan 2026 12:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b040 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 12:02:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a11d132f6c62 - main - devstat: Provide 32-bit compatibility 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a11d132f6c62f32abe44b19f7527d97ddc239058 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 12:02:02 +0000 Message-Id: <697757ba.b040.558a1a55@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a11d132f6c62f32abe44b19f7527d97ddc239058 commit a11d132f6c62f32abe44b19f7527d97ddc239058 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-26 12:01:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-26 12:01:59 +0000 devstat: Provide 32-bit compatibility If a 32-bit process running on a 64-bit kernel requests kern.devstat.all, translate each struct devstat to its 32-bit equivalent before copying it out. Also fix a bug where an early error would be ignored if there were no devices to report. MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54591 --- sys/compat/freebsd32/freebsd32.h | 27 +++++++++++++++++++ sys/kern/subr_devstat.c | 56 +++++++++++++++++++++++++++++++++++----- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7d21a5be5570..a8d54290980d 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -29,7 +29,10 @@ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ #define _COMPAT_FREEBSD32_FREEBSD32_H_ +#include #include +#include +#include #include #include #include @@ -540,4 +543,28 @@ struct ptrace_sc_remote32 { uint32_t pscr_args; }; +struct devstat32 { + u_int sequence0; + int allocated; + u_int start_count; + u_int end_count; + struct bintime32 busy_from; + struct { u_int32_t stqe_next; } dev_links; + u_int32_t device_number; + char device_name[DEVSTAT_NAME_LEN]; + int unit_number; + freebsd32_uint64_t bytes[DEVSTAT_N_TRANS_FLAGS]; + freebsd32_uint64_t operations[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 duration[DEVSTAT_N_TRANS_FLAGS]; + struct bintime32 busy_time; + struct bintime32 creation_time; + u_int32_t block_size; + freebsd32_uint64_t tag_types[3]; + devstat_support_flags flags; + devstat_type_flags device_type; + devstat_priority priority; + u_int32_t id; + u_int sequence1; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index c4d0223d484f..c62df0e210e1 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -43,6 +43,10 @@ #include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif + #include SDT_PROVIDER_DEFINE(io); @@ -398,25 +402,63 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) */ mygen = devstat_generation; - error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); - - if (devstat_num_devs == 0) - return(0); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + int32_t mygen32 = (int32_t)mygen; + error = SYSCTL_OUT(req, &mygen32, sizeof(mygen32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, &mygen, sizeof(mygen)); if (error != 0) return (error); + if (devstat_num_devs == 0) + return(0); + mtx_lock(&devstat_mutex); nds = STAILQ_FIRST(&device_statq); if (mygen != devstat_generation) error = EBUSY; mtx_unlock(&devstat_mutex); - if (error != 0) return (error); while (nds != NULL) { - error = SYSCTL_OUT(req, nds, sizeof(struct devstat)); +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + struct devstat32 ds32; + unsigned int i; + + CP(*nds, ds32, sequence0); + CP(*nds, ds32, allocated); + CP(*nds, ds32, start_count); + CP(*nds, ds32, end_count); + BT_CP(*nds, ds32, busy_from); + PTROUT_CP(*nds, ds32, dev_links.stqe_next); + CP(*nds, ds32, device_number); + strcpy(ds32.device_name, nds->device_name); + CP(*nds, ds32, unit_number); + for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++) { + FU64_CP(*nds, ds32, bytes[i]); + FU64_CP(*nds, ds32, operations[i]); + BT_CP(*nds, ds32, duration[i]); + } + BT_CP(*nds, ds32, busy_time); + BT_CP(*nds, ds32, creation_time); + CP(*nds, ds32, block_size); + for (i = 0; i < nitems(ds32.tag_types); i++) { + FU64_CP(*nds, ds32, tag_types[i]); + } + CP(*nds, ds32, flags); + CP(*nds, ds32, device_type); + CP(*nds, ds32, priority); + PTROUT_CP(*nds, ds32, id); + CP(*nds, ds32, sequence1); + error = SYSCTL_OUT(req, &ds32, sizeof(ds32)); + } else +#endif /* COMPAT_FREEBSD32 */ + error = SYSCTL_OUT(req, nds, sizeof(*nds)); if (error != 0) return (error); mtx_lock(&devstat_mutex); @@ -428,7 +470,7 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) if (error != 0) return (error); } - return(error); + return (error); } /*