From nobody Sun Apr 12 05:57:10 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 4ftfvB5gLBz6YYW8 for ; Sun, 12 Apr 2026 05:57:10 +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 4ftfvB3hT4z3mHQ for ; Sun, 12 Apr 2026 05:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973430; 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=+32ahOB4dhp1fQFU7xSd8Se/XJ5O7YF82/uKfHsEkdc=; b=SxgLriT4L2rqk5AddahgTPM+GoHZIJiC3BwCH5hjxlDngSNna15AEJIf/hsP++xzvx2dY7 WLNeHJG1MdQftPYnf//VZIMHOj2XTWbI6hwXpOncrfvf/3ZVqmWAS/saHplSoC/cM/EUUx 5KQA2EnM9mlGeK2YedfO8300x5yUxDZWnFIDUbMyqdnydhJAT5tVfZ0Xnfl2ZQ3ld2zCSK 4O8BFLRV0TM+X3KcsH2FnNTmqqo5P5pJGGZgoJIAgVbvKRIDpgHyE4HSp1qI5XWpdaJ0HD 7wTDF6P7ZaBuaQzJB1V0xn3vEIBky4Fh6sqRHTbt4kTq+SkBcACL0MOxTrHHpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973430; a=rsa-sha256; cv=none; b=hOANw+8ysZWRG1uLVRPogCygYousUIEgD08VPKJgxc0dYodL3p8jOy2fSv8zjy4/uzU3mh HCF4XRpLleZwPxi9E4Rn9LLErcESUthCQ6rzf1ymfiHi/so8qmLzgkI0Sv6dinqmZlW05E kuwYSGy9yS7R32qZzzAYSs00s4mcgHGr0S+cvlU8sKXUb1kLp2qoJul5KlT8SjMVuKXUnd 9dKDC+oKT8gUWr/a6Gx6DylSNtJ4QHF/afjiYnp2Y4B0HshZpayWSZE2qwfZRu2CN6bWNR X2kdCQG2JGRUjuF0Svff2457jpYfa3olGHEPg4/VuXt7fNxvKysx+lSzD3/dcA== 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=1775973430; 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=+32ahOB4dhp1fQFU7xSd8Se/XJ5O7YF82/uKfHsEkdc=; b=pGSHxcScMXIAOFB8Ni9VpNDlH2aRkCtx9F87FGEIF6wkT7GoV7tKz4w//0oXO8n8Lq7iAM 5Zzr3QXajAPs0T8JgIs0m8SHOk3Nucfz3TKzwYs9NZVEWZ7h1bCxsjDsiYrfiYe8uYVOQH a+R5vPJfDRyItLIZaICqDmMz9BII74IL1q1FmqwYaHUo/+0ZR84x4Ez0qY/6Fr8ls1VXaH KWgAmhMsg460vtfTkSBShGPFOG+YbkgqVd+6lVZ+tb40nuYUqRdwa/xD6cAaxLHgCOGq6J TMCmAqkEWoJO59Yx6nKlqbmZ6KkUaoOakC/14RUHbDhKzkE4+A62LLYzwXunDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvB3CyWz141j for ; Sun, 12 Apr 2026 05:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fc30c3f43f7f - stable/14 - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members 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: fc30c3f43f7f0d31e3a90ba871bd58650482e98e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:10 +0000 Message-Id: <69db3436.27e31.24a99b9c@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fc30c3f43f7f0d31e3a90ba871bd58650482e98e commit fc30c3f43f7f0d31e3a90ba871bd58650482e98e Author: Konstantin Belousov AuthorDate: 2026-02-05 19:22:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/event.h: use freebsd32_uint64_t for kevent32 64bit members Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (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 df388a7d67d1..90a4ee466084 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -681,31 +681,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 @@ -787,7 +772,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)); @@ -803,20 +787,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 1b30e4292de8..8ade9690d548 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -102,6 +102,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 */ @@ -110,12 +112,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 3240773f357b..47002a065dd6 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2375,11 +2375,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) {