d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

signal: use proc_iterate to save on work

Browse Source 
Most notably poudriere performs kill -9 -1 in jails for each port
being built. This reduces the scan from hundrends of processes to
literally 1.

Reviewed by:	jamie, markj
Differential Revision:	https://reviews.freebsd.org/D34522
This commit is contained in:
Mateusz Guzik 2022-03-10 19:58:12 +01:00
parent 5ecb5444aa
commit 69413598d2
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/kern/kern_sig.c
View File

@ -1776,18 +1776,13 @@ struct killpg1_ctx {
};
static void
killpg1_sendsig(struct proc *p, bool notself, struct killpg1_ctx *arg)
killpg1_sendsig_locked(struct proc *p, struct killpg1_ctx *arg)
{
int err;
if (p->p_pid <= 1 || (p->p_flag & P_SYSTEM) != 0 ||
(notself && p == arg->td->td_proc) || p->p_state == PRS_NEW)
return;
PROC_LOCK(p);
err = p_cansignal(arg->td, p, arg->sig);
if (err == 0 && arg->sig != 0)
pksignal(p, arg->sig, arg->ksi);
PROC_UNLOCK(p);
if (err != ESRCH)
arg->found = true;
if (err == 0)
@ -1796,6 +1791,31 @@ killpg1_sendsig(struct proc *p, bool notself, struct killpg1_ctx *arg)
arg->ret = err;
}
static void
killpg1_sendsig(struct proc *p, bool notself, struct killpg1_ctx *arg)
{
if (p->p_pid <= 1 || (p->p_flag & P_SYSTEM) != 0 ||
(notself && p == arg->td->td_proc) || p->p_state == PRS_NEW)
return;
PROC_LOCK(p);
killpg1_sendsig_locked(p, arg);
PROC_UNLOCK(p);
}
static void
kill_processes_prison_cb(struct proc *p, void *arg)
{
struct killpg1_ctx *ctx = arg;
if (p->p_pid <= 1 || (p->p_flag & P_SYSTEM) != 0 ||
(p == ctx->td->td_proc) || p->p_state == PRS_NEW)
return;
killpg1_sendsig_locked(p, ctx);
}
/*
* Common code for kill process group/broadcast kill.
* cp is calling process.
@ -1817,11 +1837,8 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi)
/*
* broadcast
*/
sx_slock(&allproc_lock);
FOREACH_PROC_IN_SYSTEM(p) {
killpg1_sendsig(p, true, &arg);
}
sx_sunlock(&allproc_lock);
prison_proc_iterate(td->td_ucred->cr_prison,
kill_processes_prison_cb, &arg);
} else {
sx_slock(&proctree_lock);
if (pgid == 0) {