Reviewed-by: Taylor Simson <tsimp...@quicinc.com>
> -----Original Message-----
> From: Laurent Vivier <laur...@vivier.eu>
> Sent: Tuesday, February 4, 2020 11:11 AM
> To: qemu-devel@nongnu.org
> Cc: Peter Maydell <peter.mayd...@linaro.org>; Josh Kunz
> <j...@google.com>; Laurent Vivier <laur...@vivier.eu>; Aleksandar
> Markovic <aleksandar.marko...@rt-rk.com>; Matus Kysel
> <mky...@tachyum.com>; Riku Voipio <riku.voi...@iki.fi>; Taylor Simpson
> <tsimp...@quicinc.com>; milos.stojano...@rt-rk.com; Marlies Ruck
> <marlies.r...@gmail.com>
> Subject: [PATCH v2 4/4] linux-user: fix use of SIGRTMIN
>
> -------------------------------------------------------------------------
> CAUTION: This email originated from outside of the organization.
> -------------------------------------------------------------------------
>
> Some RT signals can be in use by glibc,
> it's why SIGRTMIN (34) is generally greater than __SIGRTMIN (32).
>
> So SIGRTMIN cannot be mapped to TARGET_SIGRTMIN.
>
> Instead of swapping only SIGRTMIN and SIGRTMAX, map all the
> range [TARGET_SIGRTMIN ... TARGET_SIGRTMAX - X] to
> [__SIGRTMIN + X ... SIGRTMAX ]
> (SIGRTMIN is __SIGRTMIN + X).
>
> Signed-off-by: Laurent Vivier <laur...@vivier.eu>
> ---
>
> Notes:
> v2: ignore error when target sig <= TARGET_NSIG but host sig > SIGRTMAX
> replace i, j by target_sig, host_sig
> update signal_table_init() trace message
>
> linux-user/signal.c | 37 ++++++++++++++++++++++++++++++-------
> linux-user/trace-events | 3 +++
> 2 files changed, 33 insertions(+), 7 deletions(-)
>
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index c1e664f97a7c..e7e5581a016f 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -498,18 +498,23 @@ static int core_dump_signal(int sig)
>
> static void signal_table_init(void)
> {
> - int host_sig, target_sig;
> + int host_sig, target_sig, count;
>
> /*
> - * Nasty hack: Reverse SIGRTMIN and SIGRTMAX to avoid overlap with
> - * host libpthread signals. This assumes no one actually uses SIGRTMAX
> :-/
> - * To fix this properly we need to do manual signal delivery multiplexed
> - * over a single host signal.
> + * some RT signals can be in use by glibc,
> + * it's why SIGRTMIN (34) is generally greater than __SIGRTMIN (32)
> */
> - host_to_target_signal_table[__SIGRTMIN] = __SIGRTMAX;
> - host_to_target_signal_table[__SIGRTMAX] = __SIGRTMIN;
> + for (host_sig = SIGRTMIN; host_sig <= SIGRTMAX; host_sig++) {
> + target_sig = host_sig - SIGRTMIN + TARGET_SIGRTMIN;
> + if (target_sig <= TARGET_NSIG) {
> + host_to_target_signal_table[host_sig] = target_sig;
> + }
> + }
>
> /* generate signal conversion tables */
> + for (target_sig = 1; target_sig <= TARGET_NSIG; target_sig++) {
> + target_to_host_signal_table[target_sig] = _NSIG; /* poison */
> + }
> for (host_sig = 1; host_sig < _NSIG; host_sig++) {
> if (host_to_target_signal_table[host_sig] == 0) {
> host_to_target_signal_table[host_sig] = host_sig;
> @@ -519,6 +524,15 @@ static void signal_table_init(void)
> target_to_host_signal_table[target_sig] = host_sig;
> }
> }
> +
> + if (TRACE_SIGNAL_TABLE_INIT_BACKEND_DSTATE()) {
> + for (target_sig = 1, count = 0; target_sig <= TARGET_NSIG;
> target_sig++)
> {
> + if (target_to_host_signal_table[target_sig] == _NSIG) {
> + count++;
> + }
> + }
> + trace_signal_table_init(count);
> + }
> }
>
> void signal_init(void)
> @@ -817,6 +831,8 @@ int do_sigaction(int sig, const struct target_sigaction
> *act,
> int host_sig;
> int ret = 0;
>
> + trace_signal_do_sigaction_guest(sig, TARGET_NSIG);
> +
> if (sig < 1 || sig > TARGET_NSIG || sig == TARGET_SIGKILL || sig ==
> TARGET_SIGSTOP) {
> return -TARGET_EINVAL;
> }
> @@ -847,6 +863,13 @@ int do_sigaction(int sig, const struct target_sigaction
> *act,
>
> /* we update the host linux signal state */
> host_sig = target_to_host_signal(sig);
> + trace_signal_do_sigaction_host(host_sig, TARGET_NSIG);
> + if (host_sig > SIGRTMAX) {
> + /* we don't have enough host signals to map all target signals */
> + qemu_log_mask(LOG_UNIMP, "Unsupported target signal #%d,
> ignored\n",
> + sig);
> + return 0;
> + }
> if (host_sig != SIGSEGV && host_sig != SIGBUS) {
> sigfillset(&act1.sa_mask);
> act1.sa_flags = SA_SIGINFO;
> diff --git a/linux-user/trace-events b/linux-user/trace-events
> index f6de1b8befc0..0296133daeb6 100644
> --- a/linux-user/trace-events
> +++ b/linux-user/trace-events
> @@ -1,6 +1,9 @@
> # See docs/devel/tracing.txt for syntax documentation.
>
> # signal.c
> +signal_table_init(int i) "number of unavailable signals: %d"
> +signal_do_sigaction_guest(int sig, int max) "target signal %d (MAX %d)"
> +signal_do_sigaction_host(int sig, int max) "host signal %d (MAX %d)"
> # */signal.c
> user_setup_frame(void *env, uint64_t frame_addr) "env=%p
> frame_addr=0x%"PRIx64
> user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p
> frame_addr=0x%"PRIx64
> --
> 2.24.1
>
