From nobody Sun Feb 1 21:40:56 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 4f438S6nCZz6Qjbq for ; Sun, 01 Feb 2026 21:40:56 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438S467Gz3FhJ for ; Sun, 01 Feb 2026 21:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982056; 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=oCo7BdamfvB0XQprpLTvCWeZJVkqB3rGpPB3MG1btkM=; b=SnZ7GZqd5a87KDNeNRr7c2aqg9L1jOjsrT9g2d8iNI3vTT3XTknlbRkyZsTSXpjuTAPndH GyL+62GyPXTTIxsNd+BB10vsOiJ+9/1SarIqPWNWhXf3zP2QibDLOvWK0ZwruN8GxEylI1 v71HNZ2efSo17AkLqKgcdc96vPBFryE+qUV4mMAMHoz2jOcxEvMPx8+clShmq4UBu4VQNv sG39yaomrQAz64rUbdjFwyEdHaZ64SEHMk7TzSaZaXWuMLKHDwAhyGrypecfAGQVa7p4qJ UTKfE4zwFFZFx6dfcaOa98aGjE35PcCE+Bk8c3FJ+ssEYM2/dyUSwjsqvX6IoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982056; a=rsa-sha256; cv=none; b=lu4nPQQh2GzsqY/51y0SXDlgldsULDaENAZEihti+k2BwUAYGL6gK66wLPMCrndgW43ayR rZiGpue0BV25gTejh84PjDifXWQlrEVVu+UFBSh2Pq0W5TnlZy8N7315B4RmJh4+VYUNFr rlmrvAOw1H2xE9fOntB+CXhVEH37OE8JDJVw0UkLqqwtKZgABGXjvxqAswmZEJB0a2YUwg nkOIJjTKcf4rre6dt0JmDShZa9eMpKFwnr06TBbNGa8mY+HR4elTZYsV/orqXNaZY7Uqo9 FX2scVwhAYzSxSRnWc37D/ZMj0NnMGkfho19qhUUGraQLbG4c1rf57ccR/jVCA== 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=1769982056; 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=oCo7BdamfvB0XQprpLTvCWeZJVkqB3rGpPB3MG1btkM=; b=A/8YhuaZCHPK5W5mDPz+dSCCD5SHpfYCqwZvQw5Ag1/IBksdODPeu0khB432jdJQDSIqB2 Ml+C871E5hItIqKJc4+WduqkzvUmv4rBLiJnGi5IJJ8lSZ7LwV80WwgoYPVkST1zTunwRx OyZmUKXEmW6CpncWWNzM1NKy58SaINmauRSAash9pR+YYgQGW+Rm76MuTYU7cXhbsQWYpd FCqfbtvBAa4S1/y4R2/lZCMRdrsYvdb26QgB2hIpVRwjwwCMmR15xpUgvteqrEUSD6xLip RA9tRZyN3MqvM56PHKICL1G0SnujxWYsMc2VNxnRAFe08zzS+uBN0mFYcKL/pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438S3YpvzyK7 for ; Sun, 01 Feb 2026 21:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:40:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 85a43441ccff - stable/15 - kern/kern_exit.c: extract wait6_check_alive() helper 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 85a43441ccff235a3b55c7f522b65f743ef66a2a Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:40:56 +0000 Message-Id: <697fc868.3dc24.7524abc0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=85a43441ccff235a3b55c7f522b65f743ef66a2a commit 85a43441ccff235a3b55c7f522b65f743ef66a2a Author: Konstantin Belousov AuthorDate: 2026-01-08 04:50:03 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:49 +0000 kern/kern_exit.c: extract wait6_check_alive() helper (cherry picked from commit 7fe33d58a82680fcb75de7deea5a071998830b35) --- sys/kern/kern_exit.c | 96 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index df1bd25fbac8..1c0e365ecda4 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1283,7 +1283,6 @@ report_alive_proc(struct thread *td, struct proc *p, siginfo_t *siginfo, } if (status != NULL) *status = cont ? SIGCONT : W_STOPCODE(p->p_xsig); - td->td_retval[0] = p->p_pid; PROC_UNLOCK(p); } @@ -1307,6 +1306,62 @@ wait6_checkopt(int options) return (0); } +/* + * Checks and reports status for alive process, according to the + * options. Returns true if the process fits one of the requested + * options and its status was updated in siginfo. + * + * If the process was reported (the function result is true), both the + * process and proctree locks are unlocked. + */ +static bool +wait6_check_alive(struct thread *td, int options, struct proc *p, int *status, + siginfo_t *siginfo) +{ + bool report; + + PROC_LOCK_ASSERT(p, MA_OWNED); + sx_assert(&proctree_lock, SA_XLOCKED); + + if ((options & WTRAPPED) != 0 && (p->p_flag & P_TRACED) != 0) { + PROC_SLOCK(p); + report = (p->p_flag & (P_STOPPED_TRACE | P_STOPPED_SIG)) && + p->p_suspcount == p->p_numthreads && + (p->p_flag & P_WAITED) == 0; + PROC_SUNLOCK(p); + if (report) { + CTR4(KTR_PTRACE, + "wait: returning trapped pid %d status %#x (xstat %d) xthread %d", + p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig, + p->p_xthread != NULL ? + p->p_xthread->td_tid : -1); + report_alive_proc(td, p, siginfo, status, + options, CLD_TRAPPED); + return (true); + } + } + + if ((options & WUNTRACED) != 0 && (p->p_flag & P_STOPPED_SIG) != 0) { + PROC_SLOCK(p); + report = p->p_suspcount == p->p_numthreads && + (p->p_flag & P_WAITED) == 0; + PROC_SUNLOCK(p); + if (report) { + report_alive_proc(td, p, siginfo, status, options, + CLD_STOPPED); + return (true); + } + } + + if ((options & WCONTINUED) != 0 && (p->p_flag & P_CONTINUED) != 0) { + report_alive_proc(td, p, siginfo, status, options, + CLD_CONTINUED); + return (true); + } + + return (false); +} + int kern_wait6(struct thread *td, idtype_t idtype, id_t id, int *status, int options, struct __wrusage *wrusage, siginfo_t *siginfo) @@ -1314,7 +1369,6 @@ kern_wait6(struct thread *td, idtype_t idtype, id_t id, int *status, struct proc *p, *q; pid_t pid; int error, nfound, ret; - bool report; AUDIT_ARG_VALUE((int)idtype); /* XXX - This is likely wrong! */ AUDIT_ARG_PID((pid_t)id); /* XXX - This may be wrong! */ @@ -1367,43 +1421,11 @@ loop_locked: nfound++; PROC_LOCK_ASSERT(p, MA_OWNED); - if ((options & WTRAPPED) != 0 && - (p->p_flag & P_TRACED) != 0) { - PROC_SLOCK(p); - report = - ((p->p_flag & (P_STOPPED_TRACE | P_STOPPED_SIG)) && - p->p_suspcount == p->p_numthreads && - (p->p_flag & P_WAITED) == 0); - PROC_SUNLOCK(p); - if (report) { - CTR4(KTR_PTRACE, - "wait: returning trapped pid %d status %#x (xstat %d) xthread %d", - p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig, - p->p_xthread != NULL ? - p->p_xthread->td_tid : -1); - report_alive_proc(td, p, siginfo, status, - options, CLD_TRAPPED); - return (0); - } - } - if ((options & WUNTRACED) != 0 && - (p->p_flag & P_STOPPED_SIG) != 0) { - PROC_SLOCK(p); - report = (p->p_suspcount == p->p_numthreads && - ((p->p_flag & P_WAITED) == 0)); - PROC_SUNLOCK(p); - if (report) { - report_alive_proc(td, p, siginfo, status, - options, CLD_STOPPED); - return (0); - } - } - if ((options & WCONTINUED) != 0 && - (p->p_flag & P_CONTINUED) != 0) { - report_alive_proc(td, p, siginfo, status, options, - CLD_CONTINUED); + if (wait6_check_alive(td, options, p, status, siginfo)) { + td->td_retval[0] = pid; return (0); } + PROC_UNLOCK(p); }