KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kern_procctl: add get_reaper_or_p() helper

Browse Source 
Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D57487
This commit is contained in:
Konstantin Belousov
2026-06-06 20:08:17 +03:00
parent a845480cc1
commit 261c97b47e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/kern/kern_procctl.c
+10 -6
View File
@@ -132,6 +132,13 @@ protect_set(struct thread *td, struct proc *p, void *data)
return (0); return (0);
} }
static struct proc *
get_reaper_or_p(struct proc *p)
{
sx_assert(&proctree_lock, SX_LOCKED);
return ((p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p);
}
static int static int
reap_acquire(struct thread *td, struct proc *p, void *data __unused) reap_acquire(struct thread *td, struct proc *p, void *data __unused)
{ {
@@ -172,12 +179,9 @@ reap_status(struct thread *td, struct proc *p, void *data)
rs = data; rs = data;
sx_assert(&proctree_lock, SX_LOCKED); sx_assert(&proctree_lock, SX_LOCKED);
if ((p->p_treeflag & P_TREE_REAPER) == 0) { reap = get_reaper_or_p(p);
reap = p->p_reaper; if (reap == p)
} else {
reap = p;
rs->rs_flags |= REAPER_STATUS_OWNED; rs->rs_flags |= REAPER_STATUS_OWNED;
}
if (reap == initproc) if (reap == initproc)
rs->rs_flags |= REAPER_STATUS_REALINIT; rs->rs_flags |= REAPER_STATUS_REALINIT;
rs->rs_reaper = reap->p_pid; rs->rs_reaper = reap->p_pid;
@@ -536,7 +540,7 @@ reap_kill(struct thread *td, struct proc *p, void *data)
(REAPER_KILL_CHILDREN | REAPER_KILL_SUBTREE)) (REAPER_KILL_CHILDREN | REAPER_KILL_SUBTREE))
return (EINVAL); return (EINVAL);
PROC_UNLOCK(p); PROC_UNLOCK(p);
reaper = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; reaper = get_reaper_or_p(p);
ksiginfo_init(&ksi); ksiginfo_init(&ksi);
ksi.ksi_signo = rk->rk_sig; ksi.ksi_signo = rk->rk_sig;
ksi.ksi_code = SI_USER; ksi.ksi_code = SI_USER;