From nobody Wed May 4 10:08:13 2022 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 968771AAA65B; Wed, 4 May 2022 10:08:13 +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 4KtXb13Llzz4dH7; Wed, 4 May 2022 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658893; 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=glCLWeKEKfTsEg+S11GrwOTqTB58JIRK9hO1s+meN+w=; b=BdQdsFiOplL8AWlJccMfTpNQr+TdT6dY2vqDSOfUVuoa8BcvDTgnpHBYgvj5CV9nGwSOWJ KlkIeGaxlBpM78SLh70onihF2Vv1XWafSsI6mt28TCIDfzEPZgU5HuFs5mSC3NwRgwTNNF Br+9iuokJOfCe3PMiDUHQ/g141dvyIfdqT77aMYif3JS4hEWCR4wK+F4F5MGwvgFzn269z 002Zbyf7hdhJdzeHKXxsafM6FruPqIhn2JaY7YKLF2r5rwuvrHsS8ElzFy7cyFi9IzY0jU UFRDKHSKKT1Q+FCqbQRqMhRCbWIdU/IzQ8k94mCz6Y+Algac2OZqrrpLSXb9NA== 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 34C8210FD8; Wed, 4 May 2022 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244A8DK8000438; Wed, 4 May 2022 10:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244A8Drp000437; Wed, 4 May 2022 10:08:13 GMT (envelope-from git) Date: Wed, 4 May 2022 10:08:13 GMT Message-Id: <202205041008.244A8Drp000437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a1fd2911ddb0 - main - linux(4): Implement timer_settime64 syscall. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1fd2911ddb06c1a2d23ebb636a46bc20ca498e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651658893; 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=glCLWeKEKfTsEg+S11GrwOTqTB58JIRK9hO1s+meN+w=; b=YwbSKLruNlUbnFi5vk33vkrWXWYHNp1gt3tJ4gsEbpgkSvLDY0ADVe8MUHH6ndwMOKIVf+ g3z7CFbGsuN+A7dUNanhdVXTnE0naDdmfKUaUyS1TFdxnPU8RqqM5SKlxl1AZFbdrPqtQG oCxYyruSAbXEYALzjPa/KZD5LK2tEH9dfMjOyM5Xb16FtL1/nRxhJxQteYMXj5WXCM4aPI qOlSeh+UZJrqC0cIryDqccQZO3xe0w6k57i91REt5jpYZCCvE4e/5ePoHhJK3J7M3BP2xB R1feaKEfHtVSDjLxGRwu55b3lJ0IXdWmFhLYlPz6Hg3EJ2t/wNoB9j969HgAUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651658893; a=rsa-sha256; cv=none; b=APJ9t1E7aF5DrzDmK8qLZ2BZz3gBV6Wv3rIrg70IZwZ4Bvo8WXshWZOuKuMgtkhpCRF1q/ ZfhFkCAkRac7Dpph/Qqa9ejxUzR/Dh5fJ1LTOucqz1rmFfsHcYDqL/5P/uyIq4qdMNP+bJ VUcFhbc0raqraJHGVl7EHmD8eCakDbgDhokRujP7EbGMmmg+MMJy0wOYgvwvzexF+8iN8G v+NvCz4imIDyFSWET76nkNBiT6IXDC4EB8RZn5zzQhcmTJZVbrgvywMbhKkzycpoHQvfXO emlgqWIdnEJiBWgG9FulldSB/DhpDlmLIYs8XiH4mWGzg30/thj56wIDCGcQ6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a1fd2911ddb06c1a2d23ebb636a46bc20ca498e7 commit a1fd2911ddb06c1a2d23ebb636a46bc20ca498e7 Author: Dmitry Chagin AuthorDate: 2022-05-04 10:06:49 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-04 10:06:49 +0000 linux(4): Implement timer_settime64 syscall. MFC after: 2 weeks --- sys/amd64/linux32/linux32_dummy_machdep.c | 1 - sys/compat/linux/linux_timer.c | 44 +++++++++++++++++++++++++++---- sys/i386/linux/linux_dummy_machdep.c | 1 - 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/sys/amd64/linux32/linux32_dummy_machdep.c b/sys/amd64/linux32/linux32_dummy_machdep.c index d6e4d89d573a..7dbc3352b07d 100644 --- a/sys/amd64/linux32/linux32_dummy_machdep.c +++ b/sys/amd64/linux32/linux32_dummy_machdep.c @@ -68,7 +68,6 @@ DUMMY(mq_getsetattr); DUMMY(arch_prctl); /* Linux 5.0: */ DUMMY(clock_adjtime64); -DUMMY(timer_settime64); DUMMY(timerfd_gettime64); DUMMY(timerfd_settime64); DUMMY(io_pgetevents_time64); diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 83c099fbc800..3e844704f132 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -123,20 +123,54 @@ linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap) { struct l_itimerspec l_val, l_oval; struct itimerspec val, oval, *ovalp; - int error; + int flags, error; + + error = copyin(uap->new, &l_val, sizeof(l_val)); + if (error != 0) + return (error); + error = linux_to_native_itimerspec(&val, &l_val); + if (error != 0) + return (error); + ovalp = uap->old != NULL ? &oval : NULL; + error = linux_to_native_timerflags(&flags, uap->flags); + if (error != 0) + return (error); + error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); + if (error == 0 && uap->old != NULL) { + error = native_to_linux_itimerspec(&l_val, &val); + if (error == 0) + error = copyout(&l_oval, uap->old, sizeof(l_oval)); + } + return (error); +} + +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) +int +linux_timer_settime64(struct thread *td, struct linux_timer_settime64_args *uap) +{ + struct l_itimerspec64 l_val, l_oval; + struct itimerspec val, oval, *ovalp; + int flags, error; error = copyin(uap->new, &l_val, sizeof(l_val)); if (error != 0) return (error); - ITS_CP(l_val, val); + error = linux_to_native_itimerspec64(&val, &l_val); + if (error != 0) + return (error); ovalp = uap->old != NULL ? &oval : NULL; - error = kern_ktimer_settime(td, uap->timerid, uap->flags, &val, ovalp); + error = linux_to_native_timerflags(&flags, uap->flags); + if (error != 0) + return (error); + error = kern_ktimer_settime(td, uap->timerid, flags, &val, ovalp); if (error == 0 && uap->old != NULL) { - ITS_CP(oval, l_oval); - error = copyout(&l_oval, uap->old, sizeof(l_oval)); + error = native_to_linux_itimerspec64(&l_val, &val); + if (error == 0) + error = copyout(&l_oval, uap->old, sizeof(l_oval)); } return (error); } +#endif int linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *uap) diff --git a/sys/i386/linux/linux_dummy_machdep.c b/sys/i386/linux/linux_dummy_machdep.c index 57edba56004f..f4280da8df16 100644 --- a/sys/i386/linux/linux_dummy_machdep.c +++ b/sys/i386/linux/linux_dummy_machdep.c @@ -70,7 +70,6 @@ DUMMY(vm86old); DUMMY(arch_prctl); /* Linux 5.0: */ DUMMY(clock_adjtime64); -DUMMY(timer_settime64); DUMMY(timerfd_gettime64); DUMMY(timerfd_settime64); DUMMY(io_pgetevents_time64);