From owner-dev-commits-src-main@freebsd.org Sat Jul 24 11:58:36 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 988B665F1C0; Sat, 24 Jul 2021 11:58:36 +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 4GX4TS3vmHz4ccC; Sat, 24 Jul 2021 11:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6DCBB1014F; Sat, 24 Jul 2021 11:58:36 +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 16OBwaXD010810; Sat, 24 Jul 2021 11:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16OBwaQI010809; Sat, 24 Jul 2021 11:58:36 GMT (envelope-from git) Date: Sat, 24 Jul 2021 11:58:36 GMT Message-Id: <202107241158.16OBwaQI010809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 72f7ddb587a7 - main - linux: implement rt_sigsuspend(2) on arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72f7ddb587a79dbea353e40b182ea93bb1dfea21 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2021 11:58:36 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=72f7ddb587a79dbea353e40b182ea93bb1dfea21 commit 72f7ddb587a79dbea353e40b182ea93bb1dfea21 Author: Edward Tomasz Napierala AuthorDate: 2021-07-23 20:11:06 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-07-23 20:13:00 +0000 linux: implement rt_sigsuspend(2) on arm64 ... by making it architecture-independent. Reviewed By: dchagin Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D31259 --- sys/amd64/linux/linux_machdep.c | 21 --------------------- sys/amd64/linux32/linux32_machdep.c | 18 ------------------ sys/arm64/linux/linux_machdep.c | 10 ---------- sys/compat/linux/linux_signal.c | 18 ++++++++++++++++++ sys/i386/linux/linux_machdep.c | 18 ------------------ 5 files changed, 18 insertions(+), 67 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index d7b31ce89509..b67bed524c79 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -174,27 +174,6 @@ linux_iopl(struct thread *td, struct linux_iopl_args *args) return (0); } -int -linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap) -{ - l_sigset_t lmask; - sigset_t sigmask; - int error; - - LINUX_CTR2(rt_sigsuspend, "%p, %ld", - uap->newset, uap->sigsetsize); - - if (uap->sigsetsize != sizeof(l_sigset_t)) - return (EINVAL); - - error = copyin(uap->newset, &lmask, sizeof(l_sigset_t)); - if (error) - return (error); - - linux_to_bsd_sigset(&lmask, &sigmask); - return (kern_sigsuspend(td, sigmask)); -} - int linux_pause(struct thread *td, struct linux_pause_args *args) { diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 880cccbb2328..1cfda5d60e13 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -537,24 +537,6 @@ linux_sigsuspend(struct thread *td, struct linux_sigsuspend_args *args) return (kern_sigsuspend(td, sigmask)); } -int -linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap) -{ - l_sigset_t lmask; - sigset_t sigmask; - int error; - - if (uap->sigsetsize != sizeof(l_sigset_t)) - return (EINVAL); - - error = copyin(uap->newset, &lmask, sizeof(l_sigset_t)); - if (error) - return (error); - - linux_to_bsd_sigset(&lmask, &sigmask); - return (kern_sigsuspend(td, sigmask)); -} - int linux_pause(struct thread *td, struct linux_pause_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index d9b13fa631fc..283562cc1028 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -55,7 +55,6 @@ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); /* DTrace probes */ LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); -LIN_SDT_PROBE_DEFINE0(machdep, linux_rt_sigsuspend, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_sigaltstack, todo); /* @@ -124,15 +123,6 @@ linux_madvise(struct thread *td, struct linux_madvise_args *uap) return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); } -/* LINUXTODO: implement arm64 linux_rt_sigsuspend */ -int -linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap) -{ - - LIN_SDT_PROBE0(machdep, linux_rt_sigsuspend, todo); - return (EDOOFUS); -} - /* LINUXTODO: implement arm64 linux_sigaltstack */ int linux_sigaltstack(struct thread *td, struct linux_sigaltstack_args *uap) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 43213301239c..260352af5a54 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -791,3 +791,21 @@ linux_rt_tgsigqueueinfo(struct thread *td, struct linux_rt_tgsigqueueinfo_args * return (linux_do_tkill(td, tds, &ksi)); } + +int +linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap) +{ + l_sigset_t lmask; + sigset_t sigmask; + int error; + + if (uap->sigsetsize != sizeof(l_sigset_t)) + return (EINVAL); + + error = copyin(uap->newset, &lmask, sizeof(l_sigset_t)); + if (error != 0) + return (error); + + linux_to_bsd_sigset(&lmask, &sigmask); + return (kern_sigsuspend(td, sigmask)); +} diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 45474991475b..b2628738728f 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -505,24 +505,6 @@ linux_sigsuspend(struct thread *td, struct linux_sigsuspend_args *args) return (kern_sigsuspend(td, sigmask)); } -int -linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap) -{ - l_sigset_t lmask; - sigset_t sigmask; - int error; - - if (uap->sigsetsize != sizeof(l_sigset_t)) - return (EINVAL); - - error = copyin(uap->newset, &lmask, sizeof(l_sigset_t)); - if (error) - return (error); - - linux_to_bsd_sigset(&lmask, &sigmask); - return (kern_sigsuspend(td, sigmask)); -} - int linux_pause(struct thread *td, struct linux_pause_args *args) {