From nobody Mon Mar 24 02:24:48 2025 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 4ZLcMP4gNmz5r9fm; Mon, 24 Mar 2025 02:24:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLcMP1835z494Q; Mon, 24 Mar 2025 02:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742783089; 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=Z1FahKJ6R/nrCM8ve1WnPx2wrbGEZF+xtAwLrZh8PU8=; b=gCtkp+U7BuQy+mSdKEAyzWge3j/RFFKGamHQXctUiHVU+xO6MQK8pxqAODn68JL28jeSbO l2wZYOTdsYsHbHqccsQ7xzpcvkBy8wGCIuvuhe6CieB98vKEsCjoKsQyrnUe13ETnMWJLK eMM+bywq4PmR+WuLzQL+CV2IeMQKA0HNyq1RlNny5ZC30KzxwQuwB2imImASYhBvCQQtuH hlqb1mEi6I1PKiGTU+DHs5WQTlGsNwM+Dc1Jrk1fMdyWDQb6b2lMN2vMOR2h1tIns7fm2L Ai1GtMbperJFklZpHYGEl+NlJLiVLB+AzA6WRF5cfVyBJv7Ow2e7l+aRXxlMnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742783089; a=rsa-sha256; cv=none; b=wZFXmnilUbIyrwOEyA74O3iF0cLA8gn9Jn5ulZk7/bhsKyrDYPZObet2CzY0VQX5DvfBZl Z9+e3PCTwu+/BNgcv3Asip4xUeTQrq9y1uSfP8Jff81X879oTqiaB6/VOtALcvz9CsoMRm B4up5jf2fGb21XAI713FzzjjmtNaPtA47rh63fdhgg0dHfO4JsMmShhRuz2gQtbcYcMpLC XUXoCpFOHgEw79rrdWUPm3F3TQKaz/6nykhrn1mOEWuBHPE7RcYkFe6jNRbXGxniAZ8kWg LFBAnaVqSuY36s+ssML0TvDn/ewFc4BVUCd0JknsarO2PKo12+dRudIeerCoog== 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=1742783089; 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=Z1FahKJ6R/nrCM8ve1WnPx2wrbGEZF+xtAwLrZh8PU8=; b=Qx0XtFV/FL8ieRAZPAU89UNNJIJX/4bxVupwGGNwIi56E0bma9qlfZRB7IDM/fJW/pjKRf 1fLzdztzcMtHf/Zm1jl+qF+3r1Fd01ekA5hKF8DLA6JDvTEoMN32z1lm4rxqkEvK35Dkmp HTzMQ2w1p9AuXpit94hnSDMCtOxsvSKJCYJ7mT5/THs2sLrAruBNAgBYlwKTPX7ON1/HAi e81XanntO5q4biLbNFMGu5A4oCKrd1JgJ1vlz0UehLa9mQQ3h8SN1ekaSbzfVwQ8RjM3Gy +1T3v2wGoU0BdpKPddESnHVmLycbH0Zo5AtIUdOtDK547hG/PwocHjCm+llpxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLcMP0Rg3zZt5; Mon, 24 Mar 2025 02:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52O2OnN9069732; Mon, 24 Mar 2025 02:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O2OmoR069729; Mon, 24 Mar 2025 02:24:48 GMT (envelope-from git) Date: Mon, 24 Mar 2025 02:24:48 GMT Message-Id: <202503240224.52O2OmoR069729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6534c17326b2 - main - FREEBSD_COMPAT32: add freebsd32_kevent_to_kevent32() helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6534c17326b27af9d85dd7f4ed5758df0385a57f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6534c17326b27af9d85dd7f4ed5758df0385a57f commit 6534c17326b27af9d85dd7f4ed5758df0385a57f Author: Konstantin Belousov AuthorDate: 2025-03-13 23:03:59 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-24 02:24:13 +0000 FREEBSD_COMPAT32: add freebsd32_kevent_to_kevent32() helper converting struct kevent to struct kevent32 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49372 --- sys/compat/freebsd32/freebsd32_misc.c | 59 ++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index e5b2b0feeafd..d54e268f0930 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -679,6 +679,36 @@ freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap) return (error); } +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 + 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 + } +} + /* * Copy 'count' items into the destination list pointed to by uap->eventlist. */ @@ -687,36 +717,13 @@ freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; struct kevent32 ks32[KQ_NEVENTS]; - uint64_t e; - int i, j, error; + int i, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); uap = (struct freebsd32_kevent_args *)arg; - for (i = 0; i < count; i++) { - CP(kevp[i], ks32[i], ident); - CP(kevp[i], ks32[i], filter); - CP(kevp[i], ks32[i], flags); - CP(kevp[i], ks32[i], fflags); -#if BYTE_ORDER == LITTLE_ENDIAN - ks32[i].data1 = kevp[i].data; - ks32[i].data2 = kevp[i].data >> 32; -#else - ks32[i].data1 = kevp[i].data >> 32; - ks32[i].data2 = kevp[i].data; -#endif - PTROUT_CP(kevp[i], ks32[i], udata); - for (j = 0; j < nitems(kevp->ext); j++) { - e = kevp[i].ext[j]; -#if BYTE_ORDER == LITTLE_ENDIAN - ks32[i].ext64[2 * j] = e; - ks32[i].ext64[2 * j + 1] = e >> 32; -#else - ks32[i].ext64[2 * j] = e >> 32; - ks32[i].ext64[2 * j + 1] = e; -#endif - } - } + for (i = 0; i < count; i++) + freebsd32_kevent_to_kevent32(&kevp[i], &ks32[i]); error = copyout(ks32, uap->eventlist, count * sizeof *ks32); if (error == 0) uap->eventlist += count;