From nobody Sun Apr 12 05:57:23 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 4ftfvS0bsjz6YZ4x for ; Sun, 12 Apr 2026 05:57:24 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfvR67F3z3n0G for ; Sun, 12 Apr 2026 05:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973443; 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=xBjTOc2KI76M7R/GydTNKw4BtiNJbGXpaDaK6dfOFQQ=; b=g7xQA5s+loqK84d9QJ3Tv6vYZGx5CBCGHW3n02xuT5ZvKUr3X8osojdSIJr3NEguwYcY6T LRH2DVF+v5HEHi/HjWKDNpZb6u2vaNCFxi6v6jiAKmCKLrlMQBKww9ZxOeP+PCADRDoCWl MNPHFBPkn1osD/iYcs7/TfrvhnMpjCdbJ5Gr8yEsFKERvp1CEBMTXeT/9futZSw7yjqlG0 DpuIB4s+UE9OL/AZs9X1l6k6mjzav0OJkyhkJpug4nCk2iMWdVaiobqopeCp997f9tOjLg PgnHy//ay5tT2R0eI5OFZyEDxUP1dnMO7agcXXJ2dv/3hLoCuZdUzmnzdCz2Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973443; a=rsa-sha256; cv=none; b=VaZsugx6nnpbsnX/+EQc4wtFSGG3YeQqQAOicWbZTDKpJ7YCliA9BLL1Jy2CkHUOtfwB3B M8ZKmt2168OPhyZhpYHWPYV5mJj9BQZMF3FrHzRteDwJ9IJg1ntWVZJZZ9VnKX/oMClQBu 5IPvboes7xaZ0bh1CKZxhF70Q3jFOk6KhmGvxFCC38pUC9nwg+m6WuKUtVNy1yiu2Ca0CX dT6lYrRzwgSuNN88lOrekWvknIYlN7p6p4tkV6Pa8AE+M/7fXxZ+NrFcPLTChX3E8Brqob WJUc16IsVH17uB73TSCW+Xd9J1+ZFrhg3zpyz+kKOWPndTfbO1+/PvVZXZvpPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973443; 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=xBjTOc2KI76M7R/GydTNKw4BtiNJbGXpaDaK6dfOFQQ=; b=Gnm/OrPz0IxeaNJCD0yJV4E1szYEtH0tzoeoe1gc835DIRGiKFSSjOzdh69QimASJtEvXA ih484W0LfD4cvNGx6TMBZtvAabKYIqXjzgEF3Ml5HXtixUaFWfzWRJ+sRZ3GwsjAH9wwwN 0SO/hljcJHihMlewxL7zwkIxmITegIDfvuWIRzVsc0MdwXA/GLuD9gz2vA6ltOqxPr5GtL skXLpGLBSozBV6/hnwBOfD78aozUuj4enrAb66JK40pqOYeTBkE1/8qo8Vhee6huxhQG6b ghYKVYziHl0Fa4rh4slgOzAxeO9Nqb1pklmXx9GfB7w6rO8JwXZbBLX2Ejb27Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvR5j0cz14ML for ; Sun, 12 Apr 2026 05:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b4d3f0887609 - stable/14 - devstat: Provide 32-bit compatibility 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4d3f088760912dd7384d04e43e6200f76c8a8b8 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:23 +0000 Message-Id: <69db3443.30d1e.3fd8db3a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b4d3f088760912dd7384d04e43e6200f76c8a8b8 commit b4d3f088760912dd7384d04e43e6200f76c8a8b8 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-26 12:01:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:47 +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 (cherry picked from commit a11d132f6c62f32abe44b19f7527d97ddc239058) freebsd32: Fix includes The previous commit added , which isn't actually needed. Conversely, is needed (and has been for a long time) but was not included. MFC after: 1 week Fixes: a11d132f6c62 ("devstat: Provide 32-bit compatibility") Reported by: gallatin@ (cherry picked from commit 0eb2c9d39b5f5cfb68b404bca358aa5fb11ac60c) --- 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 b6412b1be917..05566e6011ce 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -30,6 +30,9 @@ #define _COMPAT_FREEBSD32_FREEBSD32_H_ #include +#include +#include +#include #include #include #include @@ -520,4 +523,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 a100ac9921c3..1bc37b970cbf 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -44,6 +44,10 @@ #include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif + #include SDT_PROVIDER_DEFINE(io); @@ -399,25 +403,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); @@ -429,7 +471,7 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS) if (error != 0) return (error); } - return(error); + return (error); } /*