git: 72f7ddb587a7 - main - linux: implement rt_sigsuspend(2) on arm64
Edward Tomasz Napierala
trasz at FreeBSD.org
Sat Jul 24 11:58:36 UTC 2021
The branch main has been updated by trasz:
URL: https://cgit.FreeBSD.org/src/commit/?id=72f7ddb587a79dbea353e40b182ea93bb1dfea21
commit 72f7ddb587a79dbea353e40b182ea93bb1dfea21
Author: Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-07-23 20:11:06 +0000
Commit: Edward Tomasz Napierala <trasz at FreeBSD.org>
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)
{
More information about the dev-commits-src-all
mailing list