From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Kyle Evans <kevans@freebsd.org>, Stacey Son <sson@FreeBSD.org>,
Warner Losh <imp@bsdimp.com>
Subject: [PATCH 22/30] bsd-user/signal.c: Fill in queue_signal
Date: Sun, 9 Jan 2022 09:19:15 -0700 [thread overview]
Message-ID: <20220109161923.85683-23-imp@bsdimp.com> (raw)
In-Reply-To: <20220109161923.85683-1-imp@bsdimp.com>
Fill in queue signal implementation, as well as routines allocate and
delete elements of the signal queue.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Kyle Evans <kevans@freebsd.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/signal.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 71 insertions(+), 1 deletion(-)
diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index 97f42f9c45e..93c3b3c5033 100644
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -109,6 +109,29 @@ static int core_dump_signal(int sig)
}
}
+/* Signal queue handling. */
+static inline struct qemu_sigqueue *alloc_sigqueue(CPUArchState *env)
+{
+ CPUState *cpu = env_cpu(env);
+ TaskState *ts = cpu->opaque;
+ struct qemu_sigqueue *q = ts->first_free;
+
+ if (!q) {
+ return NULL;
+ }
+ ts->first_free = q->next;
+ return q;
+}
+
+static inline void free_sigqueue(CPUArchState *env, struct qemu_sigqueue *q)
+{
+
+ CPUState *cpu = env_cpu(env);
+ TaskState *ts = cpu->opaque;
+ q->next = ts->first_free;
+ ts->first_free = q;
+}
+
/* Abort execution with signal. */
void QEMU_NORETURN force_sig(int target_sig)
{
@@ -174,7 +197,54 @@ void QEMU_NORETURN force_sig(int target_sig)
*/
void queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
{
- qemu_log_mask(LOG_UNIMP, "No signal queueing, dropping signal %d\n", sig);
+ CPUState *cpu = env_cpu(env);
+ TaskState *ts = cpu->opaque;
+ struct emulated_sigtable *k;
+ struct qemu_sigqueue *q, **pq;
+
+ k = &ts->sigtab[sig - 1];
+ trace_user_queue_signal(env, sig); /* We called this in the caller? XXX */
+ /*
+ * XXX does the segv changes make this go away? -- I think so
+ */
+ if (sig == TARGET_SIGSEGV && sigismember(&ts->signal_mask, SIGSEGV)) {
+ /*
+ * Guest has blocked SIGSEGV but we got one anyway. Assume this is a
+ * forced SIGSEGV (ie one the kernel handles via force_sig_info because
+ * it got a real MMU fault). A blocked SIGSEGV in that situation is
+ * treated as if using the default handler. This is not correct if some
+ * other process has randomly sent us a SIGSEGV via kill(), but that is
+ * not easy to distinguish at this point, so we assume it doesn't
+ * happen.
+ */
+ force_sig(sig);
+ }
+
+ pq = &k->first;
+
+ /*
+ * FreeBSD signals are always queued. Linux only queues real time signals.
+ * XXX this code is not thread safe. "What lock protects ts->sigtab?"
+ */
+ if (!k->pending) {
+ /* first signal */
+ q = &k->info;
+ } else {
+ q = alloc_sigqueue(env);
+ if (!q) {
+ return; /* XXX WHAT TO DO */
+ }
+ while (*pq != NULL) {
+ pq = &(*pq)->next;
+ }
+ }
+ *pq = q;
+ q->info = *info;
+ q->next = NULL;
+ k->pending = 1;
+ /* Signal that a new signal is pending. */
+ ts->signal_pending = 1;
+ return;
}
static int fatal_signal(int sig)
--
2.33.1
next prev parent reply other threads:[~2022-01-09 16:50 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 16:18 [PATCH 00/30] bsd-user: upstream our signal implementation Warner Losh
2022-01-09 16:18 ` [PATCH 01/30] bsd-user/arm/target_arch_cpu.h: Move EXCP_ATOMIC to match linux-user Warner Losh
2022-01-13 15:47 ` Peter Maydell
2022-01-23 21:30 ` Richard Henderson
2022-01-09 16:18 ` [PATCH 02/30] bsd-user/signal.c: implement force_sig_fault Warner Losh
2022-01-13 16:43 ` Peter Maydell
2022-01-23 21:36 ` Richard Henderson
2022-01-09 16:18 ` [PATCH 03/30] bsd-user/signal.c: Implement cpu_loop_exit_sigsegv Warner Losh
2022-01-13 17:00 ` Peter Maydell
2022-01-23 21:38 ` Richard Henderson
2022-01-09 16:18 ` [PATCH 04/30] bsd-user/signal.c: implement cpu_loop_exit_sigbus Warner Losh
2022-01-13 17:00 ` Peter Maydell
2022-01-23 21:38 ` Richard Henderson
2022-01-09 16:18 ` [PATCH 05/30] bsd-user/arm/arget_arch_cpu.h: Move EXCP_DEBUG and EXCP_BKPT together Warner Losh
2022-01-13 17:13 ` Peter Maydell
2022-01-14 6:33 ` Warner Losh
2022-01-23 21:40 ` Richard Henderson
2022-01-09 16:18 ` [PATCH 06/30] bsd-user/arm/target_arch_cpu.h: Correct code pointer Warner Losh
2022-01-13 17:15 ` Peter Maydell
2022-01-14 6:38 ` Warner Losh
2022-01-14 10:22 ` Peter Maydell
2022-01-17 4:12 ` Warner Losh
2022-01-23 21:43 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 07/30] bsd-user/arm/target_arch_cpu.h: Use force_sig_fault for EXCP_UDEF Warner Losh
2022-01-13 17:19 ` Peter Maydell
2022-01-23 22:07 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 08/30] bsd-user/arm/target_arch_cpu.h: Implement data faults Warner Losh
2022-01-13 17:40 ` Peter Maydell
2022-01-14 18:13 ` Warner Losh
2022-01-14 18:21 ` Peter Maydell
2022-01-24 1:12 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 09/30] bsd-user/signal.c: implement abstract target / host signal translation Warner Losh
2022-01-13 17:44 ` Peter Maydell
2022-01-14 18:27 ` Warner Losh
2022-01-09 16:19 ` [PATCH 10/30] bsd-user/signal.c: Implement signal_init() Warner Losh
2022-01-13 19:28 ` Peter Maydell
2022-01-14 18:51 ` Warner Losh
2022-01-24 1:38 ` Richard Henderson
2022-01-24 21:35 ` Warner Losh
2022-01-09 16:19 ` [PATCH 11/30] bsd-user/host/arm/host-signal.h: Implement host_signal_* Warner Losh
2022-01-13 19:32 ` Peter Maydell
2022-01-17 3:53 ` Warner Losh
2022-01-09 16:19 ` [PATCH 12/30] bsd-user/host/i386/host-signal.h: " Warner Losh
2022-01-13 19:33 ` Peter Maydell
2022-01-24 1:49 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 13/30] bsd-user/host/x86_64/host-signal.h: " Warner Losh
2022-01-13 19:33 ` Peter Maydell
2022-01-24 1:52 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 14/30] bsd-user: Add host signals to the build Warner Losh
2022-01-13 19:35 ` Peter Maydell
2022-01-24 1:56 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 15/30] bsd-user: Add trace events for bsd-usr Warner Losh
2022-01-13 19:37 ` Peter Maydell
2022-01-24 1:57 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 16/30] bsd-user/signal.c: host_to_target_siginfo_noswap Warner Losh
2022-01-13 19:43 ` Peter Maydell
2022-01-15 6:19 ` Warner Losh
2022-01-15 11:08 ` Peter Maydell
2022-01-24 2:05 ` Richard Henderson
2022-01-24 21:45 ` Warner Losh
2022-01-09 16:19 ` [PATCH 17/30] bsd-user/signal.c: Implement rewind_if_in_safe_syscall Warner Losh
2022-01-13 19:44 ` Peter Maydell
2022-01-24 2:09 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 18/30] bsd-user/signal.c: Implement host_signal_handler Warner Losh
2022-01-13 20:17 ` Peter Maydell
2022-01-16 20:52 ` Warner Losh
2022-01-09 16:19 ` [PATCH 19/30] bsd-user/strace.c: print_taken_signal Warner Losh
2022-01-13 20:20 ` Peter Maydell
2022-01-24 2:45 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 20/30] bsd-user/signal.c: core_dump_signal Warner Losh
2022-01-13 20:22 ` Peter Maydell
2022-01-13 20:28 ` Warner Losh
2022-01-13 20:40 ` Peter Maydell
2022-01-24 3:01 ` Richard Henderson
2022-01-09 16:19 ` [PATCH 21/30] bsd-user/signal.c: force_sig Warner Losh
2022-01-13 20:29 ` Peter Maydell
2022-01-13 20:53 ` Peter Maydell
2022-01-13 23:04 ` Kyle Evans
2022-01-18 22:27 ` Warner Losh
2022-01-09 16:19 ` Warner Losh [this message]
2022-01-13 20:37 ` [PATCH 22/30] bsd-user/signal.c: Fill in queue_signal Peter Maydell
2022-01-17 16:22 ` Warner Losh
2022-01-17 16:33 ` Peter Maydell
2022-01-09 16:19 ` [PATCH 23/30] bsd-user/signal.c: sigset manipulation routines Warner Losh
2022-01-14 11:13 ` Peter Maydell
2022-01-22 16:44 ` Warner Losh
2022-01-22 18:00 ` Kyle Evans
2022-01-09 16:19 ` [PATCH 24/30] bsd-user/signal.c: setup_frame Warner Losh
2022-01-14 11:40 ` Peter Maydell
2022-01-17 6:58 ` Warner Losh
2022-01-17 7:24 ` Warner Losh
2022-01-09 16:19 ` [PATCH 25/30] bsd-user/signal.c: handle_pending_signal Warner Losh
2022-01-14 11:50 ` Peter Maydell
2022-01-09 16:19 ` [PATCH 26/30] bsd-user/signal.c: tswap_siginfo Warner Losh
2022-01-14 11:54 ` Peter Maydell
2022-01-09 16:19 ` [PATCH 27/30] bsd-user/signal.c: process_pending_signals Warner Losh
2022-01-14 11:55 ` Peter Maydell
2022-01-17 2:09 ` Warner Losh
2022-01-09 16:19 ` [PATCH 28/30] bsd-user/signal.c: implement do_sigreturn Warner Losh
2022-01-14 12:12 ` Peter Maydell
2022-01-09 16:19 ` [PATCH 29/30] bsd-user/signal.c: implement do_sigaction Warner Losh
2022-01-14 13:13 ` Peter Maydell
2022-01-09 16:19 ` [PATCH 30/30] bsd-user/signal.c: do_sigaltstack Warner Losh
2022-01-14 13:18 ` Peter Maydell
2022-01-22 22:20 ` Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109161923.85683-23-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=qemu-devel@nongnu.org \
--cc=sson@FreeBSD.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).