9104847f21
changes in MD code are trivial, before this change, trapsignal and sendsig use discrete parameters, now they uses member fields of ksiginfo_t structure. For sendsig, this change allows us to pass POSIX realtime signal value to user code. 2. Remove cpu_thread_siginfo, it is no longer needed because we now always generate ksiginfo_t data and feed it to libpthread. 3. Add p_sigqueue to proc structure to hold shared signals which were blocked by all threads in the proc. 4. Add td_sigqueue to thread structure to hold all signals delivered to thread. 5. i386 and amd64 now return POSIX standard si_code, other arches will be fixed. 6. In this sigqueue implementation, pending signal set is kept as before, an extra siginfo list holds additional siginfo_t data for signals. kernel code uses psignal() still behavior as before, it won't be failed even under memory pressure, only exception is when deleting a signal, we should call sigqueue_delete to remove signal from sigqueue but not SIGDELSET. Current there is no kernel code will deliver a signal with additional data, so kernel should be as stable as before, a ksiginfo can carry more information, for example, allow signal to be delivered but throw away siginfo data if memory is not enough. SIGKILL and SIGSTOP have fast path in sigqueue_add, because they can not be caught or masked. The sigqueue() syscall allows user code to queue a signal to target process, if resource is unavailable, EAGAIN will be returned as specification said. Just before thread exits, signal queue memory will be freed by sigqueue_flush. Current, all signals are allowed to be queued, not only realtime signals. Earlier patch reviewed by: jhb, deischen Tested on: i386, amd64
211 lines
6.0 KiB
C
211 lines
6.0 KiB
C
/*-
|
|
* Copyright (c) 1999 Marcel Moolenaar
|
|
* Copyright (c) 2003 Peter Wemm
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
struct ia32_sigaltstack {
|
|
u_int32_t ss_sp; /* signal stack base */
|
|
u_int32_t ss_size; /* signal stack length */
|
|
int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */
|
|
};
|
|
|
|
struct ia32_mcontext {
|
|
u_int32_t mc_onstack; /* XXX - sigcontext compat. */
|
|
u_int32_t mc_gs; /* machine state (struct trapframe) */
|
|
u_int32_t mc_fs;
|
|
u_int32_t mc_es;
|
|
u_int32_t mc_ds;
|
|
u_int32_t mc_edi;
|
|
u_int32_t mc_esi;
|
|
u_int32_t mc_ebp;
|
|
u_int32_t mc_isp;
|
|
u_int32_t mc_ebx;
|
|
u_int32_t mc_edx;
|
|
u_int32_t mc_ecx;
|
|
u_int32_t mc_eax;
|
|
u_int32_t mc_trapno;
|
|
u_int32_t mc_err;
|
|
u_int32_t mc_eip;
|
|
u_int32_t mc_cs;
|
|
u_int32_t mc_eflags;
|
|
u_int32_t mc_esp;
|
|
u_int32_t mc_ss;
|
|
u_int32_t mc_len; /* sizeof(struct ia32_mcontext) */
|
|
/* We use the same values for fpformat and ownedfp */
|
|
u_int32_t mc_fpformat;
|
|
u_int32_t mc_ownedfp;
|
|
u_int32_t mc_spare1[1]; /* align next field to 16 bytes */
|
|
/*
|
|
* See <i386/include/npx.h> for the internals of mc_fpstate[].
|
|
*/
|
|
u_int32_t mc_fpstate[128] __aligned(16);
|
|
u_int32_t mc_spare2[8];
|
|
};
|
|
|
|
struct ia32_ucontext {
|
|
sigset_t uc_sigmask;
|
|
struct ia32_mcontext uc_mcontext;
|
|
u_int32_t uc_link;
|
|
struct ia32_sigaltstack uc_stack;
|
|
u_int32_t uc_flags;
|
|
u_int32_t __spare__[4];
|
|
};
|
|
|
|
|
|
#if defined(COMPAT_FREEBSD4)
|
|
struct ia32_mcontext4 {
|
|
u_int32_t mc_onstack; /* XXX - sigcontext compat. */
|
|
u_int32_t mc_gs; /* machine state (struct trapframe) */
|
|
u_int32_t mc_fs;
|
|
u_int32_t mc_es;
|
|
u_int32_t mc_ds;
|
|
u_int32_t mc_edi;
|
|
u_int32_t mc_esi;
|
|
u_int32_t mc_ebp;
|
|
u_int32_t mc_isp;
|
|
u_int32_t mc_ebx;
|
|
u_int32_t mc_edx;
|
|
u_int32_t mc_ecx;
|
|
u_int32_t mc_eax;
|
|
u_int32_t mc_trapno;
|
|
u_int32_t mc_err;
|
|
u_int32_t mc_eip;
|
|
u_int32_t mc_cs;
|
|
u_int32_t mc_eflags;
|
|
u_int32_t mc_esp;
|
|
u_int32_t mc_ss;
|
|
u_int32_t mc_fpregs[28];
|
|
u_int32_t __spare__[17];
|
|
};
|
|
|
|
struct ia32_ucontext4 {
|
|
sigset_t uc_sigmask;
|
|
struct ia32_mcontext4 uc_mcontext;
|
|
u_int32_t uc_link;
|
|
struct ia32_sigaltstack uc_stack;
|
|
u_int32_t __spare__[8];
|
|
};
|
|
#endif
|
|
|
|
#ifdef COMPAT_FREEBSD3
|
|
struct ia32_sigcontext3 {
|
|
u_int32_t sc_onstack;
|
|
u_int32_t sc_mask;
|
|
u_int32_t sc_esp;
|
|
u_int32_t sc_ebp;
|
|
u_int32_t sc_isp;
|
|
u_int32_t sc_eip;
|
|
u_int32_t sc_eflags;
|
|
u_int32_t sc_es;
|
|
u_int32_t sc_ds;
|
|
u_int32_t sc_cs;
|
|
u_int32_t sc_ss;
|
|
u_int32_t sc_edi;
|
|
u_int32_t sc_esi;
|
|
u_int32_t sc_ebx;
|
|
u_int32_t sc_edx;
|
|
u_int32_t sc_ecx;
|
|
u_int32_t sc_eax;
|
|
u_int32_t sc_gs;
|
|
u_int32_t sc_fs;
|
|
u_int32_t sc_trapno;
|
|
u_int32_t sc_err;
|
|
};
|
|
#endif
|
|
|
|
/*
|
|
* Signal frames, arguments passed to application signal handlers.
|
|
*/
|
|
union ia32_sigval {
|
|
int sigval_int;
|
|
u_int32_t sigval_ptr;
|
|
};
|
|
struct ia32_siginfo {
|
|
int si_signo; /* signal number */
|
|
int si_errno; /* errno association */
|
|
int si_code; /* signal code */
|
|
int32_t si_pid; /* sending process */
|
|
u_int32_t si_uid; /* sender's ruid */
|
|
int si_status; /* exit value */
|
|
u_int32_t si_addr; /* faulting instruction */
|
|
union ia32_sigval si_value; /* signal value */
|
|
int32_t si_band; /* band event for SIGPOLL */
|
|
int __spare__[7]; /* gimme some slack */
|
|
};
|
|
|
|
#ifdef COMPAT_FREEBSD4
|
|
struct ia32_sigframe4 {
|
|
u_int32_t sf_signum;
|
|
u_int32_t sf_siginfo; /* code or pointer to sf_si */
|
|
u_int32_t sf_ucontext; /* points to sf_uc */
|
|
u_int32_t sf_addr; /* undocumented 4th arg */
|
|
u_int32_t sf_ah; /* action/handler pointer */
|
|
struct ia32_ucontext4 sf_uc; /* = *sf_ucontext */
|
|
struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
|
|
};
|
|
#endif
|
|
|
|
struct ia32_sigframe {
|
|
u_int32_t sf_signum;
|
|
u_int32_t sf_siginfo; /* code or pointer to sf_si */
|
|
u_int32_t sf_ucontext; /* points to sf_uc */
|
|
u_int32_t sf_addr; /* undocumented 4th arg */
|
|
u_int32_t sf_ah; /* action/handler pointer */
|
|
/* Beware, hole due to ucontext being 16 byte aligned! */
|
|
struct ia32_ucontext sf_uc; /* = *sf_ucontext */
|
|
struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */
|
|
};
|
|
|
|
#ifdef COMPAT_FREEBSD3
|
|
struct ia32_siginfo3 {
|
|
struct ia32_sigcontext3 si_sc;
|
|
int si_signo;
|
|
int si_code;
|
|
union ia32_sigval si_value;
|
|
};
|
|
struct ia32_sigframe3 {
|
|
int sf_signum;
|
|
u_int32_t sf_arg2; /* int or siginfo_t */
|
|
u_int32_t sf_scp;
|
|
u_int32_t sf_addr;
|
|
u_int32_t sf_ah; /* action/handler pointer */
|
|
struct ia32_siginfo3 sf_siginfo;
|
|
};
|
|
#endif
|
|
|
|
struct ksiginfo;
|
|
extern char ia32_sigcode[];
|
|
extern char freebsd4_ia32_sigcode[];
|
|
extern int sz_ia32_sigcode;
|
|
extern int sz_freebsd4_ia32_sigcode;
|
|
extern void ia32_sendsig(sig_t, struct ksiginfo *, sigset_t *);
|
|
extern void ia32_setregs(struct thread *td, u_long entry, u_long stack,
|
|
u_long ps_strings);
|
|
extern void siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst);
|