From nobody Fri Feb 18 14:52:28 2022 X-Original-To: dev-commits-src-branches@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 68FBB19D73B6; Fri, 18 Feb 2022 14:52:29 +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 4K0ZRd0xdzz3Flt; Fri, 18 Feb 2022 14:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195949; 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=OKIHwo6CHrpqNyJe4W8Lk0vKwJPotgshnu05qIJ7+a0=; b=rgcUHSAA9DRygmkugATyGa8FDk3K1iUUt3emW+gKz6eaoHwYM6LI7weoXtFHXD2PZlXYlI sRedyMV/csr3MF4Ht/9aquZczDhn/GD1ges8+hI56DhuntGFWKA8awrC2RUv1t9WXNuIDR DBUmhUdkl726SQT0kw3Ow2zeZYdiLDd+/R0PqMP4PF+OGfVhYe/sXHapnXeV5naL3a/oiJ oOJsQIfluPX3kCAbF60p3KbfqsAtsjjr2g5dkOT8VAfG0gPl/wMlpb6OGu0OOM9iVn3Ioi FezjIwNNNnefKqwbRjDIfPozwYEOWGxKcQzdnpIe/oqefsdjK33QZsxpbxummw== 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 E8B241F2DA; Fri, 18 Feb 2022 14:52:28 +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 21IEqShF077562; Fri, 18 Feb 2022 14:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IEqSub077561; Fri, 18 Feb 2022 14:52:28 GMT (envelope-from git) Date: Fri, 18 Feb 2022 14:52:28 GMT Message-Id: <202202181452.21IEqSub077561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 15acd92e8f45 - stable/13 - linux: implement rt_sigsuspend(2) on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 15acd92e8f45bd470dec641659b11ccb2c32f078 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195949; 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=OKIHwo6CHrpqNyJe4W8Lk0vKwJPotgshnu05qIJ7+a0=; b=mLGspVRCvjvg5uV3HQsxd7F/NgQFP+Kx3sLTstTLYr/Nd18DmRDkcLX9uPg+5v/kCeZdIq mJQzRM7/MOqkVnGgq8lZGRtbQSMbzvJL62XnqrKN0vnkyLDAnJWiUA/bErgkvMWLC+WFI2 ki6dHPfjHUgG1kAQa6FjUCOKq00fG2mG0is25nFa2atGHjOqosNuYWQVwHrBEwFb2wPuqp czF3ylBBgykAjFb8zapa9dwCdXzgtMLhiQ3ONIgRTPc3U0bT4fxOcPAdQIZZ9AjLqLqCvP Cy4u54g5Dc1cCHmo0sGahRVhPrVFCRqE4jNmneYhw0J2hlECUU7CvxthI6s2ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645195949; a=rsa-sha256; cv=none; b=sVmkIYMHOVvN+32XQ6Xfu4WQ6NFSwaj2DmVduDd+MBjnZdJbGTfCnZrmFx2cgXWXyBRRyd 4q1LUDK6YPaxng4HCLOaalIaOIRmJTLrMA6JAz3mfGeHgVwgxDDLeNJCDF0jAjpNl9AD9H UCi4m2PewwWp+Hlfim6Y2LhufZpfGSzoxTIpyoEbiOv4Xs75rMifZidRa8FJk7Wd0ulry0 iQjqL0A618EULphsk3eQgGQEVSjSfuGIqcOyKwBM8MqwPUtY4bKry17/sVjTTTLLc1i4RV LAe0XidEnBCr3CEK/5LQnZmpaxtZ0oyzpUcI8DXN/RF4pd8ae63fr76H9BNuZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=15acd92e8f45bd470dec641659b11ccb2c32f078 commit 15acd92e8f45bd470dec641659b11ccb2c32f078 Author: Edward Tomasz Napierala AuthorDate: 2021-07-23 20:11:06 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-14 18:45:24 +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 (cherry picked from commit 72f7ddb587a79dbea353e40b182ea93bb1dfea21) --- 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 4736fd3d1682..6c9f63b3a21c 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -173,27 +173,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 8ae82f3df8ca..ffb04daa852e 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -536,24 +536,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 8e10fc9d26a1..c67c4aa6479a 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -53,7 +53,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); /* @@ -122,15 +121,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 0e2fbd31b398..f2c458a1c42c 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -747,3 +747,21 @@ linux_rt_tgsigqueueinfo(struct thread *td, struct linux_rt_tgsigqueueinfo_args * lsiginfo_to_ksiginfo(&linfo, &ksi, sig); 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 d2d713d4776d..4d2db1269dc9 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -507,24 +507,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) {