From nobody Thu Sep 28 22:28:18 2023 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 4RxSmg2qn6z4vhTF; Thu, 28 Sep 2023 22:28:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RxSmg0vfrz3QsX; Thu, 28 Sep 2023 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695940099; 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=CYM68nB6Vw4eSGrlxAOF82y1BVxL0C2b3Kkj4KY25FA=; b=dKDK8LPlkixvGH5m3jH8hw92y91GB3d0ptEzW9HiqDOKA3Gs8YSvyJci6fl460J/qjm2ys QCvKoEdEMnPUqLKaUhUWXOhc6eMSvDQ4/DOtPG1vCeWn8MlhVTRzs8iq6oAIYjlyPSkIZ8 Vm2lS7lwP5GFVoJr8lhytXIiRlbUWLvTNSlvyHDtJRpBw7VfiOWAZWO9UKl9Z3aFiXLxQd zJQ5C0sT78euDCeVuHgoHSSNjB1DyttbaddK7YJKC3eOqC5H9pKMpj8XpgFIKDx0vh9GQ4 09PKrMABMjbo04zbN2UuPiLAXqIlC00aohzK6x52dThK3685nz5YiaIga7zfdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695940099; a=rsa-sha256; cv=none; b=B1OkYCOmvqsE5eiqnI8N7QkHPAI2SXGgJ3GP0sd0vJ59e/b0ty3mn7QyFlT17s5E9z7jpq 8Qv4HwCXo24p1u+YFhZLEwQqC8KwX0gvM4TzhSS1jxvODrg+coaQeVwhirxoh1m7e4743z 2T5Iihc/VnvOAXlJeEk3jI4VsRrUeehZhEYcpgaySaWo8OcXO20oTkPxCoLeCZn0IPuPNO RIn/m4BsiyHzwFpOnupPvbhiKObuAShCQ02csCvEdS3DNVlJ3yMWxsG9a1UKiEYqqAMP+m nebfGtczjTV+3okI+Wl7hMToThu31DGqCCU8bWICF02cgZyWjBaTKmMrjiEPxg== 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=1695940099; 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=CYM68nB6Vw4eSGrlxAOF82y1BVxL0C2b3Kkj4KY25FA=; b=vOSjeO9NTg8EwIYwh+26YJNarT3aO1fM/d1dj+ZI5vJrujdU0P/IsngoRSEyXxVRHbgTQy AHAQsRTTb6JR1qHm19ZNMxorzUBtaaWriByuan110PEmDw/JYF59iWxJffIwWoTD67Onax zi1W1bzkYlrNx93yvaIH2Rx+OS4qqt/0ljI1PMK4ydJ2bK+0oVpYCVCYIdqfY5fA1L0lnX mdCoPaAHWGgwmDOvE0QYfaS2vRqN/CEuHotdudxn4BfHH/fTnhb9amfZ30/yoAt66gMwiB q7uDhPHCn7S5OdX1RCSdVc1BFT+7YmarmOhXVV25K0wElr+suyWVuh/sDUffPQ== 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 4RxSmg01NGzg8v; Thu, 28 Sep 2023 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38SMSIeZ074086; Thu, 28 Sep 2023 22:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SMSIaA074083; Thu, 28 Sep 2023 22:28:18 GMT (envelope-from git) Date: Thu, 28 Sep 2023 22:28:18 GMT Message-Id: <202309282228.38SMSIaA074083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 40293a0995d9 - releng/14.0 - timerfd: Relocate 32-bit compat code 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 40293a0995d92717dc88bd7ccbf0d841b9a9d428 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=40293a0995d92717dc88bd7ccbf0d841b9a9d428 commit 40293a0995d92717dc88bd7ccbf0d841b9a9d428 Author: Jake Freeland AuthorDate: 2023-09-17 15:01:58 +0000 Commit: Warner Losh CommitDate: 2023-09-28 22:26:25 +0000 timerfd: Relocate 32-bit compat code 32-bit compatibility code is conventionally stored in sys/compat/freebsd32. Move freebsd32_timerfd_gettime() and freebsd32_timerfd_settime() from sys/kern/sys_timerfd.c to sys/compat/freebsd32/freebsd32_misc.c. MFC After: 3 days Reviewed by: imp, markj Differential Revision; https://reviews.freebsd.org/D41640 (cherry picked from commit 918966a27479b4fb7c4c8999c4926d83c2c081e5) (cherry picked from commit 27d567847b18275012bf39fb517dceee41b1ed33) Approved-by: re (cperciva) --- sys/compat/freebsd32/freebsd32_misc.c | 55 +++++++++++++++++++++++++++++++ sys/kern/sys_timerfd.c | 61 ----------------------------------- 2 files changed, 55 insertions(+), 61 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 22ee4897083e..c26e7b97e717 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -82,6 +82,7 @@ #include #include #include +#include #include #include #include @@ -3138,6 +3139,60 @@ freebsd32_ktimer_gettime(struct thread *td, return (error); } +int +freebsd32_timerfd_gettime(struct thread *td, + struct freebsd32_timerfd_gettime_args *uap) +{ + struct itimerspec curr_value; + struct itimerspec32 curr_value32; + int error; + + error = kern_timerfd_gettime(td, uap->fd, &curr_value); + if (error == 0) { + CP(curr_value, curr_value32, it_value.tv_sec); + CP(curr_value, curr_value32, it_value.tv_nsec); + CP(curr_value, curr_value32, it_interval.tv_sec); + CP(curr_value, curr_value32, it_interval.tv_nsec); + error = copyout(&curr_value32, uap->curr_value, + sizeof(curr_value32)); + } + + return (error); +} + +int +freebsd32_timerfd_settime(struct thread *td, + struct freebsd32_timerfd_settime_args *uap) +{ + struct itimerspec new_value, old_value; + struct itimerspec32 new_value32, old_value32; + int error; + + error = copyin(uap->new_value, &new_value32, sizeof(new_value32)); + if (error != 0) + return (error); + CP(new_value32, new_value, it_value.tv_sec); + CP(new_value32, new_value, it_value.tv_nsec); + CP(new_value32, new_value, it_interval.tv_sec); + CP(new_value32, new_value, it_interval.tv_nsec); + if (uap->old_value == NULL) { + error = kern_timerfd_settime(td, uap->fd, uap->flags, + &new_value, NULL); + } else { + error = kern_timerfd_settime(td, uap->fd, uap->flags, + &new_value, &old_value); + if (error == 0) { + CP(old_value, old_value32, it_value.tv_sec); + CP(old_value, old_value32, it_value.tv_nsec); + CP(old_value, old_value32, it_interval.tv_sec); + CP(old_value, old_value32, it_interval.tv_nsec); + error = copyout(&old_value32, uap->old_value, + sizeof(old_value32)); + } + } + return (error); +} + int freebsd32_clock_getcpuclockid2(struct thread *td, struct freebsd32_clock_getcpuclockid2_args *uap) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index a81b5ad0fade..e245baed88be 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -54,11 +54,6 @@ #include -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); static struct mtx timerfd_list_lock; @@ -598,59 +593,3 @@ sys_timerfd_settime(struct thread *td, struct timerfd_settime_args *uap) } return (error); } - -#ifdef COMPAT_FREEBSD32 -int -freebsd32_timerfd_gettime(struct thread *td, - struct freebsd32_timerfd_gettime_args *uap) -{ - struct itimerspec curr_value; - struct itimerspec32 curr_value32; - int error; - - error = kern_timerfd_gettime(td, uap->fd, &curr_value); - if (error == 0) { - CP(curr_value, curr_value32, it_value.tv_sec); - CP(curr_value, curr_value32, it_value.tv_nsec); - CP(curr_value, curr_value32, it_interval.tv_sec); - CP(curr_value, curr_value32, it_interval.tv_nsec); - error = copyout(&curr_value32, uap->curr_value, - sizeof(curr_value32)); - } - - return (error); -} - -int -freebsd32_timerfd_settime(struct thread *td, - struct freebsd32_timerfd_settime_args *uap) -{ - struct itimerspec new_value, old_value; - struct itimerspec32 new_value32, old_value32; - int error; - - error = copyin(uap->new_value, &new_value32, sizeof(new_value32)); - if (error != 0) - return (error); - CP(new_value32, new_value, it_value.tv_sec); - CP(new_value32, new_value, it_value.tv_nsec); - CP(new_value32, new_value, it_interval.tv_sec); - CP(new_value32, new_value, it_interval.tv_nsec); - if (uap->old_value == NULL) { - error = kern_timerfd_settime(td, uap->fd, uap->flags, - &new_value, NULL); - } else { - error = kern_timerfd_settime(td, uap->fd, uap->flags, - &new_value, &old_value); - if (error == 0) { - CP(old_value, old_value32, it_value.tv_sec); - CP(old_value, old_value32, it_value.tv_nsec); - CP(old_value, old_value32, it_interval.tv_sec); - CP(old_value, old_value32, it_interval.tv_nsec); - error = copyout(&old_value32, uap->old_value, - sizeof(old_value32)); - } - } - return (error); -} -#endif