From nobody Wed Apr 22 00:44:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g0gTf32f0z6b0Tl for ; Wed, 22 Apr 2026 00:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g0gTf2BR4z3hdf for ; Wed, 22 Apr 2026 00:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776818662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROsmQEdFhkNl3/TuzTGabxrhbOlqhmcgqD83AoyUayE=; b=vinmyekUcbSi7U6fUb/c1kIIwyvMKyfFK1txea/m+SkbRnU5erOdl7uUygG/Q22H9HZAna Cxg4N32EG5ad7FIY464Gv9UxmdTVjImsO3dwng4Tc2BJ4JJ/cr3scObpUklpB+WHXc1/y3 hlvmhZtaWd6zvyL5W07rt0omo4+33A0+03Kvq2peCHmgz2TRsX43sEciSFNiaMsOczN9w+ G/Ov5Uwe2Ccu2e7hgedw4b9ZYYhcmKyvlfqnTblWOAqDmImuWLtU4fjNa8TyqQTa9PqV84 sUKOebhF9v5y9N+4zrHYW0tJZlTpMT7ohvURPz1WYkHtZX9RzYDCwzO25DmFNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776818662; a=rsa-sha256; cv=none; b=JJcHfEyEukF9m64N0mqvt9p2isiS8nThJ6fpaA79MNtkb1trECbM7PSULCF37S3WLFbzO5 g8/J3wWBBez1eWZ9/NP0AfPasUYrmUrXsObuE9RMEyEjZ9BRmeMHnfUtrd1zbtxvMEjRK/ jw2elEyvXo14lGE61PO83tYzJXJC81vlesWUf4O82oqUChkTte9yNFXhK+1stPaq9tnOpg nQm/1+8zFJzKaK2ioZnFcAH+7zjvVrU00dnhyHCld+iF8J2Y3DPLUgVEt8MrrUvmFjlDe9 sX/kBSSz81VArn0k3ezb1i5fbCAhFqADs6nOLX0PXJ4kEqIhg5KY2yrUVB3Dtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776818662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROsmQEdFhkNl3/TuzTGabxrhbOlqhmcgqD83AoyUayE=; b=CEv0/SdmtrJBWyvmcvw0rmku82aqIi+esrWXdBrpeEpyPjnye74bj+uLke8grL4WhYNFnT /u7TWtC9L5Emssy84EdVuWFFdNX4Nd9zF4J/VoFxCo2WZ+auocaeGihnNjjhdwyT1zLCxd ItSmvlGfzlL7pKdhNQt2HAt7ml3TEuq8lq9qYgQHfK926qgK+ea4u1Noy34lkd9wNXhOsF ys8ti3Z8oDEcHd5Lra1sD7QiSXJ8TQliIUp3c905g+xFHPxw2CvH9Fu3XCCNdKRkl5Qjlr RTXFIHBZpW02nSEZBjr003ogKOFTF87wIJjuAAq8IA+FN7plQXKhO4YXjFVcmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0gTf0zR1z176w for ; Wed, 22 Apr 2026 00:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f2b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 00:44:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: GenericRikka From: Konstantin Belousov Subject: git: 0f89380a3d20 - main - kern/proc: expose reaper PID and subtree root in struct kinfo_proc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f89380a3d208d67698f2d35afd35257e5fdbe09 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 00:44:22 +0000 Message-Id: <69e819e6.1f2b1.a1a0956@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f89380a3d208d67698f2d35afd35257e5fdbe09 commit 0f89380a3d208d67698f2d35afd35257e5fdbe09 Author: GenericRikka AuthorDate: 2026-04-20 23:32:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-21 23:36:07 +0000 kern/proc: expose reaper PID and subtree root in struct kinfo_proc Expose process reaper metadata through struct kinfo_proc so userland can reconstruct reaper hierarchies from kern.proc.all without adding a new procctl(2) operation. Two pid_t fields are added by carving 8 bytes from ki_sparestrings (46 -> 38), restoring KI_NSPARE_INT to 2 and keeping sizeof(struct kinfo_proc) unchanged: ki_reaper: PID of the owning reaper process ki_reapsubtree: PID of the direct child of the reaper that roots the subtree the process belongs to fill_kinfo_proc_pgrp() populates both fields under proctree_lock. kvm_proclist() is updated for crash dump consumers. The freebsd32 compat struct and freebsd32_kinfo_proc_out() are updated accordingly. PR: 293871 Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56538 --- lib/libkvm/kvm_proc.c | 8 ++++++++ sys/compat/freebsd32/freebsd32.h | 4 +++- sys/kern/kern_proc.c | 4 ++++ sys/sys/user.h | 4 +++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index fed483978e62..a952888c9ef0 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -121,6 +121,7 @@ kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p, struct thread mtd; struct proc proc; struct proc pproc; + struct proc rproc; struct sysentvec sysent; char svname[KI_EMULNAMELEN]; struct thread *td = NULL; @@ -365,6 +366,13 @@ nopgrp: kp->ki_xstat = KW_EXITCODE(proc.p_xexit, proc.p_xsig); kp->ki_acflag = proc.p_acflag; kp->ki_lock = proc.p_lock; + if (KREAD(kd, (u_long)proc.p_reaper, &rproc)) { + _kvm_err(kd, kd->program, + "can't read reaper at %p", proc.p_reaper); + return (-1); + } + kp->ki_reaper = rproc.p_pid; + kp->ki_reapsubtree = proc.p_reapsubtree; kp->ki_tdev_freebsd11 = kp->ki_tdev; /* truncate */ /* Per-thread items; iterate as appropriate. */ diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 1436b630689f..3f5b93859f5c 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -392,8 +392,10 @@ struct kinfo_proc32 { char ki_emul[KI_EMULNAMELEN+1]; char ki_loginclass[LOGINCLASSLEN+1]; char ki_moretdname[MAXCOMLEN-TDNAMLEN+1]; - char ki_sparestrings[46]; + char ki_sparestrings[38]; int ki_spareints[KI_NSPARE_INT]; + pid_t ki_reaper; + pid_t ki_reapsubtree; freebsd32_uint64_t ki_tdev; int ki_oncpu; int ki_lastcpu; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 1f9e39a0dda3..a88ed6902f3a 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1235,6 +1235,8 @@ fill_kinfo_proc_pgrp(struct proc *p, struct kinfo_proc *kp) kp->ki_tdev = NODEV; kp->ki_tdev_freebsd11 = kp->ki_tdev; /* truncate */ } + kp->ki_reaper = p->p_reaper->p_pid; + kp->ki_reapsubtree = p->p_reapsubtree; } /* @@ -1494,6 +1496,8 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_fibnum); CP(*ki, *ki32, ki_cr_flags); CP(*ki, *ki32, ki_jid); + CP(*ki, *ki32, ki_reaper); + CP(*ki, *ki32, ki_reapsubtree); CP(*ki, *ki32, ki_numthreads); CP(*ki, *ki32, ki_tid); CP(*ki, *ki32, ki_pri); diff --git a/sys/sys/user.h b/sys/sys/user.h index 59210913f889..e1a3897cd319 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -186,8 +186,10 @@ struct kinfo_proc { * front of ki_sparestrings, and ints from the end of ki_spareints. * That way the spare room from both arrays will remain contiguous. */ - char ki_sparestrings[46]; /* spare string space */ + char ki_sparestrings[38]; /* spare string space */ int ki_spareints[KI_NSPARE_INT]; /* spare room for growth */ + pid_t ki_reaper; /* pid of reaper process */ + pid_t ki_reapsubtree; /* reaper subtree id */ uint64_t ki_tdev; /* controlling tty dev */ int ki_oncpu; /* Which cpu we are on */ int ki_lastcpu; /* Last cpu we were on */