From nobody Sat Jun 13 01:03:51 2026 X-Original-To: dev-commits-src-branches@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 4gcdS81NlJz6hSWX for ; Sat, 13 Jun 2026 01:03:52 +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 4gcdS76XZQz3ldf for ; Sat, 13 Jun 2026 01:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7ed4e7HfEZwQWbIVUFyIjqMbYJje5dh2SairXTsJbc=; b=UYf9/O5B9pdVJ9H3gOVCoGSv7cASaMOx/8hsDB19i8PuRf5+MuFfvi5ZQO1KHtBCPRmWoe zrikWxXmhOWOgO+h+tNgKYsseOeueLYzBiVHvwTmUaR2cKLOH4z1D2MMhHWMw/p4TWcwCh GWQ61LaadUu466B9jCUCHQP55drwT3m1fbG0H3FpMkS3pfxrl/cbo6ya46rVvPyrQAFry1 KxWYfp+dXFurl/Zui4buZPfgYeftM+Fo3wcuBS8G4QQHt2xl3VCemX1IGbhBxZj8VRJypD kHy8KSsMoeM5iLeEjqCIj2EduH5wLRy6VWmQ743tioJND/CFD7ACdPjQAEIrWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312632; a=rsa-sha256; cv=none; b=kdSDiXfziSEQtQd3Dl9q5YA8uszHB7siIrtQTqKxanEq/wUfeLx0ouGwZB/7UhCSKkS8Cz H+yMPQzgIJaYu1zLs/D2wGNWcahQlCck/3rGFgSEwI0Iw9KvEYg9LZp2FX24PM0v+KnqhG 6g24e1HJy6ykY3sGTplW2mfF4UahAZ5Cldx6OCmyI552SYXGURUzBR3EdwgseJaMW+HN+g oPzTN67A1kjnUrOmTKIelT9SmV6PAIc7qp1r7w4Ox2xVHIjf6ZS/aYI8dHBdOSPerSHHH2 6ub2d8zzF2/OL5XvlZs3WlOvq01plnG98sMp51Ev9D5Omo1jQ5QK1osvzgJ+ig== 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=1781312632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7ed4e7HfEZwQWbIVUFyIjqMbYJje5dh2SairXTsJbc=; b=SJyam24EzJ1uAnIGlQux01w/boZFH9/dFn+42/8lRpQG57ts8I65RYX0l/9X/+okgFWF80 GMxsSfrAnBU/jocfkr0Ld7KETt8vG/vm7XI5Ni7XI0F+TNR28KbpmxEpR9NApQQGbDn91C NV+eSAcs7NMu1JlwULnsI86/LrazpXLDdYX3lbt7N6oIbnDpCdK8H8RN72EpjKuOWPki83 SzPE8Wf6dP4fN/jY48D4COMhNfhugCBtiPqCJJRG1UpHPZR5nuoIVLMeki7ZXwy8ptKXMV PWqw4d/8zA2/EuHvUZEKfHcWhJzdPZu3HMFa0JQvc8utCgN9goijgnXtXpkAgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdS75qB5z11tT for ; Sat, 13 Jun 2026 01:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6b02fe2caa5c - stable/15 - kern_procctl: add get_reaper_or_p() helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b02fe2caa5cdd3b0ad012f7a0a47b0bd1bbb758 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:03:51 +0000 Message-Id: <6a2cac77.210df.58c27410@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b02fe2caa5cdd3b0ad012f7a0a47b0bd1bbb758 commit 6b02fe2caa5cdd3b0ad012f7a0a47b0bd1bbb758 Author: Konstantin Belousov AuthorDate: 2026-06-06 17:08:17 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:35 +0000 kern_procctl: add get_reaper_or_p() helper (cherry picked from commit 261c97b47ea4f120bfa4a04aab7d35c70dde8c8f) --- sys/kern/kern_procctl.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 57ca5665d453..db9de394c101 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -132,6 +132,13 @@ protect_set(struct thread *td, struct proc *p, void *data) 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 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; sx_assert(&proctree_lock, SX_LOCKED); - if ((p->p_treeflag & P_TREE_REAPER) == 0) { - reap = p->p_reaper; - } else { - reap = p; + reap = get_reaper_or_p(p); + if (reap == p) rs->rs_flags |= REAPER_STATUS_OWNED; - } if (reap == initproc) rs->rs_flags |= REAPER_STATUS_REALINIT; 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)) return (EINVAL); PROC_UNLOCK(p); - reaper = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; + reaper = get_reaper_or_p(p); ksiginfo_init(&ksi); ksi.ksi_signo = rk->rk_sig; ksi.ksi_code = SI_USER;