Author: kib
Date: Sat Dec 19 11:31:28 2009
New Revision: 200722
URL: http://svn.freebsd.org/changeset/base/200722
Log:
MFC r198507:
Use kern_sigprocmask() instead of direct manipulation of td_sigmask to
reschedule newly blocked signals.
MFC r198590:
Trapsignal() calls kern_sigprocmask() when delivering catched signal
with proc lock held.
MFC r198670:
For trapsignal() and postsig(), kern_sigprocmask() is called with
both process lock and curproc->p_sigacts->ps_mtx locked. Prevent lock
recursion on ps_mtx in reschedule_signals().
Modified:
stable/8/sys/amd64/amd64/machdep.c
stable/8/sys/amd64/ia32/ia32_signal.c
stable/8/sys/amd64/linux32/linux32_sysvec.c
stable/8/sys/arm/arm/machdep.c
stable/8/sys/compat/freebsd32/freebsd32_misc.c
stable/8/sys/i386/i386/machdep.c
stable/8/sys/i386/linux/linux_sysvec.c
stable/8/sys/ia64/ia64/machdep.c
stable/8/sys/kern/kern_context.c
stable/8/sys/kern/kern_sig.c
stable/8/sys/mips/mips/pm_machdep.c
stable/8/sys/pc98/pc98/machdep.c
stable/8/sys/powerpc/aim/machdep.c
stable/8/sys/powerpc/booke/machdep.c
stable/8/sys/sparc64/sparc64/machdep.c
stable/8/sys/sun4v/sun4v/machdep.c
stable/8/sys/sys/signalvar.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/amd64/amd64/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -415,7 +415,7 @@ sigreturn(td, uap)
ucontext_t uc;
struct proc *p = td->td_proc;
struct trapframe *regs;
- const ucontext_t *ucp;
+ ucontext_t *ucp;
long rflags;
int cs, error, ret;
ksiginfo_t ksi;
@@ -478,7 +478,6 @@ sigreturn(td, uap)
td->td_pcb->pcb_fsbase = ucp->uc_mcontext.mc_fsbase;
td->td_pcb->pcb_gsbase = ucp->uc_mcontext.mc_gsbase;
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
@@ -486,10 +485,7 @@ sigreturn(td, uap)
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_flags |= PCB_FULLCTX;
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
Modified: stable/8/sys/amd64/ia32/ia32_signal.c
==============================================================================
--- stable/8/sys/amd64/ia32/ia32_signal.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/amd64/ia32/ia32_signal.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -244,10 +244,8 @@ freebsd32_setcontext(struct thread *td,
if (ret == 0) {
ret = ia32_set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
+ &uc.uc_sigmask, NULL, 0);
}
}
}
@@ -273,10 +271,8 @@ freebsd32_swapcontext(struct thread *td,
if (ret == 0) {
ret = ia32_set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
+ &uc.uc_sigmask, NULL, 0);
}
}
}
@@ -544,9 +540,8 @@ freebsd4_freebsd32_sigreturn(td, uap)
} */ *uap;
{
struct ia32_ucontext4 uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ia32_ucontext4 *ucp;
+ struct ia32_ucontext4 *ucp;
int cs, eflags, error;
ksiginfo_t ksi;
@@ -610,11 +605,7 @@ freebsd4_freebsd32_sigreturn(td, uap)
regs->tf_fs = ucp->uc_mcontext.mc_fs;
regs->tf_gs = ucp->uc_mcontext.mc_gs;
- PROC_LOCK(p);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
}
@@ -631,9 +622,8 @@ freebsd32_sigreturn(td, uap)
} */ *uap;
{
struct ia32_ucontext uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ia32_ucontext *ucp;
+ struct ia32_ucontext *ucp;
int cs, eflags, error, ret;
ksiginfo_t ksi;
@@ -702,11 +692,7 @@ freebsd32_sigreturn(td, uap)
regs->tf_gs = ucp->uc_mcontext.mc_gs;
regs->tf_flags = TF_HASSEGS;
- PROC_LOCK(p);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
}
Modified: stable/8/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- stable/8/sys/amd64/linux32/linux32_sysvec.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/amd64/linux32/linux32_sysvec.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -565,9 +565,9 @@ linux_sendsig(sig_t catcher, ksiginfo_t
int
linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_sigframe frame;
struct trapframe *regs;
+ sigset_t bmask;
l_sigset_t lmask;
int eflags, i;
ksiginfo_t ksi;
@@ -623,11 +623,8 @@ linux_sigreturn(struct thread *td, struc
lmask.__bits[0] = frame.sf_sc.sc_mask;
for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
lmask.__bits[i+1] = frame.sf_extramask[i];
- PROC_LOCK(p);
- linux_to_bsd_sigset(&lmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&lmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context.
@@ -666,9 +663,9 @@ linux_sigreturn(struct thread *td, struc
int
linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_ucontext uc;
struct l_sigcontext *context;
+ sigset_t bmask;
l_stack_t *lss;
stack_t ss;
struct trapframe *regs;
@@ -725,11 +722,8 @@ linux_rt_sigreturn(struct thread *td, st
return(EINVAL);
}
- PROC_LOCK(p);
- linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&uc.uc_sigmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context
Modified: stable/8/sys/arm/arm/machdep.c
==============================================================================
--- stable/8/sys/arm/arm/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/arm/arm/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -605,7 +605,6 @@ sigreturn(td, uap)
const struct __ucontext *sigcntxp;
} */ *uap;
{
- struct proc *p = td->td_proc;
struct sigframe sf;
struct trapframe *tf;
int spsr;
@@ -627,11 +626,7 @@ sigreturn(td, uap)
set_mcontext(td, &sf.sf_uc.uc_mcontext);
/* Restore signal mask. */
- PROC_LOCK(p);
- td->td_sigmask = sf.sf_uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &sf.sf_uc.uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
Modified: stable/8/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/8/sys/compat/freebsd32/freebsd32_misc.c Sat Dec 19 11:13:59
2009 (r200721)
+++ stable/8/sys/compat/freebsd32/freebsd32_misc.c Sat Dec 19 11:31:28
2009 (r200722)
@@ -2482,7 +2482,7 @@ ofreebsd32_sigprocmask(struct thread *td
int error;
OSIG2SIG(uap->mask, set);
- error = kern_sigprocmask(td, uap->how, &set, &oset, 1);
+ error = kern_sigprocmask(td, uap->how, &set, &oset, SIGPROCMASK_OLD);
SIG2OSIG(oset, td->td_retval[0]);
return (error);
}
@@ -2546,15 +2546,11 @@ int
ofreebsd32_sigblock(struct thread *td,
struct ofreebsd32_sigblock_args *uap)
{
- struct proc *p = td->td_proc;
- sigset_t set;
+ sigset_t set, oset;
OSIG2SIG(uap->mask, set);
- SIG_CANTMASK(set);
- PROC_LOCK(p);
- SIG2OSIG(td->td_sigmask, td->td_retval[0]);
- SIGSETOR(td->td_sigmask, set);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_BLOCK, &set, &oset, 0);
+ SIG2OSIG(oset, td->td_retval[0]);
return (0);
}
@@ -2562,16 +2558,11 @@ int
ofreebsd32_sigsetmask(struct thread *td,
struct ofreebsd32_sigsetmask_args *uap)
{
- struct proc *p = td->td_proc;
- sigset_t set;
+ sigset_t set, oset;
OSIG2SIG(uap->mask, set);
- SIG_CANTMASK(set);
- PROC_LOCK(p);
- SIG2OSIG(td->td_sigmask, td->td_retval[0]);
- SIGSETLO(td->td_sigmask, set);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &set, &oset, 0);
+ SIG2OSIG(oset, td->td_retval[0]);
return (0);
}
Modified: stable/8/sys/i386/i386/machdep.c
==============================================================================
--- stable/8/sys/i386/i386/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/i386/i386/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -756,7 +756,6 @@ osigreturn(td, uap)
struct osigcontext sc;
struct trapframe *regs;
struct osigcontext *scp;
- struct proc *p = td->td_proc;
int eflags, error;
ksiginfo_t ksi;
@@ -856,17 +855,14 @@ osigreturn(td, uap)
regs->tf_eip = scp->sc_pc;
regs->tf_eflags = eflags;
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (scp->sc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- SIGSETOLD(td->td_sigmask, scp->sc_mask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, (sigset_t *)&scp->sc_mask, NULL,
+ SIGPROCMASK_OLD);
return (EJUSTRETURN);
}
#endif /* COMPAT_43 */
@@ -883,9 +879,8 @@ freebsd4_sigreturn(td, uap)
} */ *uap;
{
struct ucontext4 uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ucontext4 *ucp;
+ struct ucontext4 *ucp;
int cs, eflags, error;
ksiginfo_t ksi;
@@ -973,18 +968,13 @@ freebsd4_sigreturn(td, uap)
bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
}
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
-
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
#endif /* COMPAT_FREEBSD4 */
@@ -1000,9 +990,8 @@ sigreturn(td, uap)
} */ *uap;
{
ucontext_t uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const ucontext_t *ucp;
+ ucontext_t *ucp;
int cs, eflags, error, ret;
ksiginfo_t ksi;
@@ -1094,7 +1083,6 @@ sigreturn(td, uap)
bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
}
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
@@ -1102,10 +1090,7 @@ sigreturn(td, uap)
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
Modified: stable/8/sys/i386/linux/linux_sysvec.c
==============================================================================
--- stable/8/sys/i386/linux/linux_sysvec.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/i386/linux/linux_sysvec.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -667,10 +667,10 @@ linux_sendsig(sig_t catcher, ksiginfo_t
int
linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_sigframe frame;
struct trapframe *regs;
l_sigset_t lmask;
+ sigset_t bmask;
int eflags, i;
ksiginfo_t ksi;
@@ -725,11 +725,8 @@ linux_sigreturn(struct thread *td, struc
lmask.__bits[0] = frame.sf_sc.sc_mask;
for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
lmask.__bits[i+1] = frame.sf_extramask[i];
- PROC_LOCK(p);
- linux_to_bsd_sigset(&lmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&lmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context.
@@ -767,9 +764,9 @@ linux_sigreturn(struct thread *td, struc
int
linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_ucontext uc;
struct l_sigcontext *context;
+ sigset_t bmask;
l_stack_t *lss;
stack_t ss;
struct trapframe *regs;
@@ -826,11 +823,8 @@ linux_rt_sigreturn(struct thread *td, st
return(EINVAL);
}
- PROC_LOCK(p);
- linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&uc.uc_sigmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context
Modified: stable/8/sys/ia64/ia64/machdep.c
==============================================================================
--- stable/8/sys/ia64/ia64/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/ia64/ia64/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -1119,11 +1119,9 @@ sigreturn(struct thread *td,
{
ucontext_t uc;
struct trapframe *tf;
- struct proc *p;
struct pcb *pcb;
tf = td->td_frame;
- p = td->td_proc;
pcb = td->td_pcb;
/*
@@ -1135,17 +1133,13 @@ sigreturn(struct thread *td,
set_mcontext(td, &uc.uc_mcontext);
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (sigonstack(tf->tf_special.sp))
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- td->td_sigmask = uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
Modified: stable/8/sys/kern/kern_context.c
==============================================================================
--- stable/8/sys/kern/kern_context.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/kern/kern_context.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -89,10 +89,8 @@ setcontext(struct thread *td, struct set
if (ret == 0) {
ret = set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
&uc.uc_sigmask,
+ NULL, 0);
}
}
}
@@ -118,10 +116,8 @@ swapcontext(struct thread *td, struct sw
if (ret == 0) {
ret = set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
+ &uc.uc_sigmask, NULL, 0);
}
}
}
Modified: stable/8/sys/kern/kern_sig.c
==============================================================================
--- stable/8/sys/kern/kern_sig.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/kern/kern_sig.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -216,7 +216,7 @@ static int sigproptbl[NSIG] = {
SA_KILL|SA_PROC, /* SIGUSR2 */
};
-static void reschedule_signals(struct proc *p, sigset_t block);
+static void reschedule_signals(struct proc *p, sigset_t block, int flags);
static void
sigqueue_start(void)
@@ -1020,7 +1020,7 @@ kern_sigprocmask(struct thread *td, int
* possibly waking it up.
*/
if (p->p_numthreads != 1)
- reschedule_signals(p, new_block);
+ reschedule_signals(p, new_block, flags);
if (!(flags & SIGPROCMASK_PROC_LOCKED))
PROC_UNLOCK(p);
@@ -1392,15 +1392,11 @@ osigblock(td, uap)
register struct thread *td;
struct osigblock_args *uap;
{
- struct proc *p = td->td_proc;
- sigset_t set;
+ sigset_t set, oset;
OSIG2SIG(uap->mask, set);
- SIG_CANTMASK(set);
- PROC_LOCK(p);
- SIG2OSIG(td->td_sigmask, td->td_retval[0]);
- SIGSETOR(td->td_sigmask, set);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_BLOCK, &set, &oset, 0);
+ SIG2OSIG(oset, td->td_retval[0]);
return (0);
}
@@ -1414,16 +1410,11 @@ osigsetmask(td, uap)
struct thread *td;
struct osigsetmask_args *uap;
{
- struct proc *p = td->td_proc;
- sigset_t set;
+ sigset_t set, oset;
OSIG2SIG(uap->mask, set);
- SIG_CANTMASK(set);
- PROC_LOCK(p);
- SIG2OSIG(td->td_sigmask, td->td_retval[0]);
- SIGSETLO(td->td_sigmask, set);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &set, &oset, 0);
+ SIG2OSIG(oset, td->td_retval[0]);
return (0);
}
#endif /* COMPAT_43 */
@@ -1839,6 +1830,7 @@ void
trapsignal(struct thread *td, ksiginfo_t *ksi)
{
struct sigacts *ps;
+ sigset_t mask;
struct proc *p;
int sig;
int code;
@@ -1861,9 +1853,11 @@ trapsignal(struct thread *td, ksiginfo_t
#endif
(*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)],
ksi, &td->td_sigmask);
- SIGSETOR(td->td_sigmask, ps->ps_catchmask[_SIG_IDX(sig)]);
+ mask = ps->ps_catchmask[_SIG_IDX(sig)];
if (!SIGISMEMBER(ps->ps_signodefer, sig))
- SIGADDSET(td->td_sigmask, sig);
+ SIGADDSET(mask, sig);
+ kern_sigprocmask(td, SIG_BLOCK, &mask, NULL,
+ SIGPROCMASK_PROC_LOCKED | SIGPROCMASK_PS_LOCKED);
if (SIGISMEMBER(ps->ps_sigreset, sig)) {
/*
* See kern_sigaction() for origin of this code.
@@ -2399,7 +2393,7 @@ stopme:
}
static void
-reschedule_signals(struct proc *p, sigset_t block)
+reschedule_signals(struct proc *p, sigset_t block, int flags)
{
struct sigacts *ps;
struct thread *td;
@@ -2417,12 +2411,14 @@ reschedule_signals(struct proc *p, sigse
td = sigtd(p, i, 0);
signotify(td);
- mtx_lock(&ps->ps_mtx);
+ if (!(flags & SIGPROCMASK_PS_LOCKED))
+ mtx_lock(&ps->ps_mtx);
if (p->p_flag & P_TRACED || SIGISMEMBER(ps->ps_sigcatch, i))
tdsigwakeup(td, i, SIG_CATCH,
(SIGISMEMBER(ps->ps_sigintr, i) ? EINTR :
ERESTART));
- mtx_unlock(&ps->ps_mtx);
+ if (!(flags & SIGPROCMASK_PS_LOCKED))
+ mtx_unlock(&ps->ps_mtx);
}
}
@@ -2450,7 +2446,7 @@ tdsigcleanup(struct thread *td)
SIGFILLSET(unblocked);
SIGSETNAND(unblocked, td->td_sigmask);
SIGFILLSET(td->td_sigmask);
- reschedule_signals(p, unblocked);
+ reschedule_signals(p, unblocked, 0);
}
@@ -2676,7 +2672,7 @@ postsig(sig)
struct sigacts *ps;
sig_t action;
ksiginfo_t ksi;
- sigset_t returnmask;
+ sigset_t returnmask, mask;
KASSERT(sig != 0, ("postsig"));
@@ -2731,9 +2727,11 @@ postsig(sig)
} else
returnmask = td->td_sigmask;
- SIGSETOR(td->td_sigmask, ps->ps_catchmask[_SIG_IDX(sig)]);
+ mask = ps->ps_catchmask[_SIG_IDX(sig)];
if (!SIGISMEMBER(ps->ps_signodefer, sig))
- SIGADDSET(td->td_sigmask, sig);
+ SIGADDSET(mask, sig);
+ kern_sigprocmask(td, SIG_BLOCK, &mask, NULL,
+ SIGPROCMASK_PROC_LOCKED | SIGPROCMASK_PS_LOCKED);
if (SIGISMEMBER(ps->ps_sigreset, sig)) {
/*
Modified: stable/8/sys/mips/mips/pm_machdep.c
==============================================================================
--- stable/8/sys/mips/mips/pm_machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/mips/mips/pm_machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -213,13 +213,11 @@ int
sigreturn(struct thread *td, struct sigreturn_args *uap)
{
struct trapframe *regs;
- const ucontext_t *ucp;
- struct proc *p;
+ ucontext_t *ucp;
ucontext_t uc;
int error;
ucp = &uc;
- p = td->td_proc;
error = copyin(uap->sigcntxp, &uc, sizeof(uc));
if (error != 0)
@@ -229,7 +227,7 @@ sigreturn(struct thread *td, struct sigr
/* #ifdef DEBUG */
if (ucp->uc_mcontext.mc_regs[ZERO] != UCONTEXT_MAGIC) {
- printf("sigreturn: pid %d, ucp %p\n", p->p_pid, ucp);
+ printf("sigreturn: pid %d, ucp %p\n", td->td_proc->p_pid, ucp);
printf(" old sp %x ra %x pc %x\n",
regs->sp, regs->ra, regs->pc);
printf(" new sp %x ra %x pc %x z %x\n",
@@ -253,11 +251,8 @@ sigreturn(struct thread *td, struct sigr
regs->mullo = ucp->uc_mcontext.mullo;
regs->mulhi = ucp->uc_mcontext.mulhi;
- PROC_LOCK(p);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
+
return(EJUSTRETURN);
}
Modified: stable/8/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/8/sys/pc98/pc98/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/pc98/pc98/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -686,7 +686,6 @@ osigreturn(td, uap)
struct osigcontext sc;
struct trapframe *regs;
struct osigcontext *scp;
- struct proc *p = td->td_proc;
int eflags, error;
ksiginfo_t ksi;
@@ -786,17 +785,14 @@ osigreturn(td, uap)
regs->tf_eip = scp->sc_pc;
regs->tf_eflags = eflags;
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (scp->sc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- SIGSETOLD(td->td_sigmask, scp->sc_mask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, (sigset_t *)&scp->sc_mask, NULL,
+ SIGPROCMASK_OLD);
return (EJUSTRETURN);
}
#endif /* COMPAT_43 */
@@ -813,9 +809,8 @@ freebsd4_sigreturn(td, uap)
} */ *uap;
{
struct ucontext4 uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ucontext4 *ucp;
+ struct ucontext4 *ucp;
int cs, eflags, error;
ksiginfo_t ksi;
@@ -903,18 +898,13 @@ freebsd4_sigreturn(td, uap)
bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
}
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
-
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
#endif /* COMPAT_FREEBSD4 */
@@ -930,9 +920,8 @@ sigreturn(td, uap)
} */ *uap;
{
ucontext_t uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const ucontext_t *ucp;
+ ucontext_t *ucp;
int cs, eflags, error, ret;
ksiginfo_t ksi;
@@ -1024,18 +1013,14 @@ sigreturn(td, uap)
bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
}
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
else
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
return (EJUSTRETURN);
}
Modified: stable/8/sys/powerpc/aim/machdep.c
==============================================================================
--- stable/8/sys/powerpc/aim/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/powerpc/aim/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -695,7 +695,6 @@ sendsig(sig_t catcher, ksiginfo_t *ksi,
int
sigreturn(struct thread *td, struct sigreturn_args *uap)
{
- struct proc *p;
ucontext_t uc;
int error;
@@ -710,12 +709,7 @@ sigreturn(struct thread *td, struct sigr
if (error != 0)
return (error);
- p = td->td_proc;
- PROC_LOCK(p);
- td->td_sigmask = uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
CTR3(KTR_SIG, "sigreturn: return td=%p pc=%#x sp=%#x",
td, uc.uc_mcontext.mc_srr0, uc.uc_mcontext.mc_gpr[1]);
Modified: stable/8/sys/powerpc/booke/machdep.c
==============================================================================
--- stable/8/sys/powerpc/booke/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/powerpc/booke/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -664,7 +664,6 @@ set_mcontext(struct thread *td, const mc
int
sigreturn(struct thread *td, struct sigreturn_args *uap)
{
- struct proc *p;
ucontext_t uc;
int error;
@@ -679,12 +678,7 @@ sigreturn(struct thread *td, struct sigr
if (error != 0)
return (error);
- p = td->td_proc;
- PROC_LOCK(p);
- td->td_sigmask = uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
CTR3(KTR_SIG, "sigreturn: return td=%p pc=%#x sp=%#x",
td, uc.uc_mcontext.mc_srr0, uc.uc_mcontext.mc_gpr[1]);
Modified: stable/8/sys/sparc64/sparc64/machdep.c
==============================================================================
--- stable/8/sys/sparc64/sparc64/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/sparc64/sparc64/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -653,11 +653,7 @@ sigreturn(struct thread *td, struct sigr
if (error != 0)
return (error);
- PROC_LOCK(p);
- td->td_sigmask = uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
CTR4(KTR_SIG, "sigreturn: return td=%p pc=%#lx sp=%#lx tstate=%#lx",
td, mc->mc_tpc, mc->mc_sp, mc->mc_tstate);
Modified: stable/8/sys/sun4v/sun4v/machdep.c
==============================================================================
--- stable/8/sys/sun4v/sun4v/machdep.c Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/sun4v/sun4v/machdep.c Sat Dec 19 11:31:28 2009
(r200722)
@@ -667,11 +667,7 @@ sigreturn(struct thread *td, struct sigr
if (error != 0)
return (error);
- PROC_LOCK(p);
- td->td_sigmask = uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
CTR4(KTR_SIG, "sigreturn: return td=%p pc=%#lx sp=%#lx tstate=%#lx",
td, mc->mc_tpc, mc->mc_sp, mc->mc_tstate);
Modified: stable/8/sys/sys/signalvar.h
==============================================================================
--- stable/8/sys/sys/signalvar.h Sat Dec 19 11:13:59 2009
(r200721)
+++ stable/8/sys/sys/signalvar.h Sat Dec 19 11:31:28 2009
(r200722)
@@ -319,6 +319,7 @@ extern int kern_logsigexit; /* Sysctl va
/* flags for kern_sigprocmask */
#define SIGPROCMASK_OLD 0x0001
#define SIGPROCMASK_PROC_LOCKED 0x0002
+#define SIGPROCMASK_PS_LOCKED 0x0004
/*
* Machine-independent functions:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
