From nobody Sat Feb 21 21:34:44 2026 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 4fJL453Xm1z6SJSQ for ; Sat, 21 Feb 2026 21:34:45 +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 4fJL446Hnzz3P87 for ; Sat, 21 Feb 2026 21:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709684; 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=T6Ly1ZvrIdpNr1jGYX2WPDFiLQW5O7cTVctu8qTXdHI=; b=r0giQylvoddOPDrRmj23HGZdBLsJXSQPI8OEUHtcKED6nqdCmLOvALj2hT36nQfCxcfPvD gFvkxPadwMFuSu+b/tCyWxVdGueF/ceXKknK8/wkW/wdqn6IPebKaLinEN1/SpwCbHKIa5 +T11a2vekaAf8mOYxtzBjupm0xyVh7mcVDwLp06CHWlMD5X608vO11ABxjJ295DP4en3Db DlukEsNixzinq1GNzn1Q+rHgZxCQl02n3tVhJMlq7snJVp6gMCjYCF2sV0A54PibWUE6wc eSKp9y07k/+2sqgu+8N9KSatbhqoOI0HOOf4xn+FoTIKizGn3mYLGKuW9EbuVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709684; a=rsa-sha256; cv=none; b=gONiCBWpWYpB4NcB+NfMTRf4k+Uj+yJnhM7zAaxXI5zv8OxnlG/ezDmiPOYI95V9K8a/mn GnswVfsvO4r+MM3j9zFRrGKO+aF+l4KRMTVYhS2rYnPOy8ZLASpiiRpAkUEzgQePpO4/r0 NEGhqNtzHMCCxShY0G3XKJShWMLZaZ/actI3z+l6/eLMfq/SemXn/S2bDPm1ELWa4qbPnP 26yiXbIGerrDNhR8feEAg4NAuxnKOIE0cTe829D4784g7x1RR1vO5xXkGtWNR3zaayk0zO zgOYuvRpwSVu3oe1EnBstD63pbXp8/FSqOgHyTHTdq9xASOAKZsAujzZZBEBOA== 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=1771709684; 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=T6Ly1ZvrIdpNr1jGYX2WPDFiLQW5O7cTVctu8qTXdHI=; b=k3jWzo8vFOVFOAqz/Ffj7bMeFa6iKgGci/UC+1d4uhc0rNL0vT3iRg+IYGB5t4RyS6btbn TsID1N0Rym0U0Diwwrs/ZM8npUZAHn2biGQS7iwGR7W+rl1OXZLeAARORTNYYvImj8GAnk R17EEz8yCE5mC0jICX14G1kBffRTYqu0VBqIt3PVbDOtFCLbJ2fojT3uupRAqHbHut8cdJ pJ+Z81EwfwAUW2jbqnb6mDB5on+xDS7HdV1rxH+gIUatEdUJzVTPNara+q66rx3P3OiK1T RuNTcL0UX9M7bIORgo5cpGRTzkB6zS1+RcPkSY3mj5E1PHjQTDFzhY6z3/+txw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL445d6xz1Dr for ; Sat, 21 Feb 2026 21:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21fcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f0fe4e11be92 - stable/15 - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:44 +0000 Message-Id: <699a24f4.21fcc.4fbdc9fc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 commit f0fe4e11be92e5823f3a7974c9a1c6783ae074f2 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:22:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/event.h: use freebsd32_uint64_t for kevent32 64bit members (cherry picked from commit ad639400dc9f1c5aec470996473bb54edc113dba) --- sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- sys/sys/event.h | 6 ++++-- usr.bin/kdump/kdump.c | 6 +----- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index c76c9d5c1838..544842803e21 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -713,31 +713,16 @@ freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap) static void freebsd32_kevent_to_kevent32(const struct kevent *kevp, struct kevent32 *ks32) { - uint64_t e; int j; CP(*kevp, *ks32, ident); CP(*kevp, *ks32, filter); CP(*kevp, *ks32, flags); CP(*kevp, *ks32, fflags); -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->data1 = kevp->data; - ks32->data2 = kevp->data >> 32; -#else - ks32->data1 = kevp->data >> 32; - ks32->data2 = kevp->data; -#endif + FU64_CP(*kevp, *ks32, data); PTROUT_CP(*kevp, *ks32, udata); - for (j = 0; j < nitems(kevp->ext); j++) { - e = kevp->ext[j]; -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->ext64[2 * j] = e; - ks32->ext64[2 * j + 1] = e >> 32; -#else - ks32->ext64[2 * j] = e >> 32; - ks32->ext64[2 * j + 1] = e; -#endif - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(*kevp, *ks32, ext[j]); } void @@ -819,7 +804,6 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; struct kevent32 ks32[KQ_NEVENTS]; - uint64_t e; int i, j, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); @@ -835,20 +819,10 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) CP(ks32[i], kevp[i], filter); CP(ks32[i], kevp[i], flags); CP(ks32[i], kevp[i], fflags); - kevp[i].data = PAIR32TO64(uint64_t, ks32[i].data); + FU64_CP(ks32[i], kevp[i], data); PTRIN_CP(ks32[i], kevp[i], udata); - for (j = 0; j < nitems(kevp->ext); j++) { -#if BYTE_ORDER == LITTLE_ENDIAN - e = ks32[i].ext64[2 * j + 1]; - e <<= 32; - e += ks32[i].ext64[2 * j]; -#else - e = ks32[i].ext64[2 * j]; - e <<= 32; - e += ks32[i].ext64[2 * j + 1]; -#endif - kevp[i].ext[j] = e; - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(ks32[i], kevp[i], ext[j]); } done: return (error); diff --git a/sys/sys/event.h b/sys/sys/event.h index b339392c7d04..c313cafa9e99 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,6 +104,8 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) +#include + struct kevent32 { __uint32_t ident; /* identifier for this event */ short filter; /* filter for event */ @@ -112,12 +114,12 @@ struct kevent32 { #ifndef __amd64__ __uint32_t pad0; #endif - __uint32_t data1, data2; + freebsd32_uint64_t data; __uint32_t udata; /* opaque user data identifier */ #ifndef __amd64__ __uint32_t pad1; #endif - __uint32_t ext64[8]; + freebsd32_uint64_t ext[4]; }; #ifdef _WANT_FREEBSD11_KEVENT diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 17ed43b55c5a..d3f2ac882e61 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2404,11 +2404,7 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.filter = kev32.filter; kev.flags = kev32.flags; kev.fflags = kev32.fflags; -#if BYTE_ORDER == BIG_ENDIAN - kev.data = kev32.data2 | ((int64_t)kev32.data1 << 32); -#else - kev.data = kev32.data1 | ((int64_t)kev32.data2 << 32); -#endif + memcpy(&kev.data, &kev32.data, sizeof(kev.data)); kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); } else if (strcmp(name, "freebsd11_kevent32") == 0) {