From nobody Sun Aug 16 02:47:12 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 4hN0js0G8fz6pHGP for ; Sun, 16 Aug 2026 02:47:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hN0jr4sW6z3flH for ; Sun, 16 Aug 2026 02:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848432; 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=2KMSqVU1yrPpA0hguOqtIJWDWoRI1Y97ueXvWFyKylM=; b=kuPeMGSuExY8OPEm9bZcl8AIq8YrWia7sy4aW1EdItneTyyrFL4Oh0P23zbCSdDqq4VKk0 XsHHFsq56PWQGh/nNxF7Qkqpk92EEckntf1av50sD0YlOUJcItPQF90l+QcCWdHLoeqCXD O+Grt64goCw3LFKuIZ5QY7LoK6R2c66RUB0pP5go7pbEdU3xRt065TFYRxftkDu9ls12JK bGrTP0KYjieSB8SmcN2Nh/6e8FLJVNOvuFGPX3zwfY8S/Qo5I7K9ah7bqc7/APhPtzw0rh Px1K3eza59xHJ9H0USRAOoWRdEj4BzvUUm5Q2x1i28N97Vd+sezhim3VAQ83UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848432; a=rsa-sha256; cv=none; b=I5+ah3Ynv9vQoC3FRDvMPEZJA9SsmHmveG6OdwVQ/weWc6c6LjLMIqk/sWkeB0vq+fmX4Q JsLdi3/WKxHRMwlb35FU6VWbtUsVTJJoE7siAsxyvnPR3ptkZpjl5iNQDgDdz46oRlGDs4 vpgL/nVmmtGNMI7ivK4QfUD1PUuu8ZnGhWwIrQAGXX8maN4JdCtU8x86S4Sdv9+zs+qVBd 8dNmcQZvsxN8CmBc7RfjeL+isYM5ffoDc2NrHkhx5j4MRO2lsoJ15cWHdZT4XjRfAETfVK bBedBhBxrMi2BO0+DhGf79RQwYLLJ0temP56OGxvHSqsC2ifaxCzNLYdQeG8sw== 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=1786848432; 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=2KMSqVU1yrPpA0hguOqtIJWDWoRI1Y97ueXvWFyKylM=; b=qHj1E4ELC9YdxB7mY9Abvor/Lcz33y1BMLt4FPEftcaJFJhCANHXkmptbLObVPEfjOell5 wI+IJLhz5/jHBgeuYCVw/4bJ23pDDO1Qze6TdT0irmhtysaFrYLqMHex3XzIOpuqIUZHKN /HAU9f44mBOMyuTE85jkRIp8l8bHze1wrVjYbA7VfMKqM/A38T8GmneZxXKLVUi/K3VGjy 6l+TQIvQ7io6h/qGHnxxs4SLR0JAtuPEy6BE+5Zn1A+3Y7feix6/HtGNIk92hL8B9IAoKK GzMG3nAjGPFpcJpvyPJPO4t167HoIa4i5BRQlQ5zcwa1XpfQm2mWNpEdar3wgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0jr3vQvz17xq for ; Sun, 16 Aug 2026 02:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4485f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:47:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ecdc9cfea64c - stable/15 - pdwait(2): change handling of the exited processes 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: ecdc9cfea64c987bfb1a2382b7e263016005cd54 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:47:12 +0000 Message-Id: <6a8124b0.4485f.63ada8d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ecdc9cfea64c987bfb1a2382b7e263016005cd54 commit ecdc9cfea64c987bfb1a2382b7e263016005cd54 Author: Konstantin Belousov AuthorDate: 2026-07-28 00:31:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:35 +0000 pdwait(2): change handling of the exited processes (cherry picked from commit 7da4edd300984abe67ff503828c1674a28e4b8b0) --- sys/kern/kern_exit.c | 27 ++++++++++++++++++--------- sys/kern/sys_procdesc.c | 29 +++++++++++++++++++++++++---- sys/sys/procdesc.h | 11 +++++++++-- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 2e8e95e33d8c..b61fb7bcf2f1 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1578,29 +1578,38 @@ kern_pdwait(struct thread *td, int fd, int *status, ("closed proc %p procdesc %p pd flags %#x", pd->pd_proc, pd, pd->pd_flags)); + if ((pd->pd_flags & PDF_EXITED) != 0) { + if ((options & WEXITED) == 0) { + error = ESRCH; + goto exit_tree_locked; + } + procdesc_fill_winfo(pd, false); + *status = KW_EXITCODE(pd->pd_xexit, pd->pd_xsig); + if (wrusage != NULL) { + memcpy(wrusage, &pd->pd_wrusage, + sizeof(*wrusage)); + } + if (siginfo != NULL) { + memcpy(siginfo, &pd->pd_siginfo, + sizeof(*siginfo)); + } + goto exit_tree_locked; + } p = pd->pd_proc; if (p == NULL) { error = ESRCH; goto exit_tree_locked; } PROC_LOCK(p); + MPASS(p->p_state != PRS_ZOMBIE); error = p_canwait(td, p); if (error != 0) break; - if ((options & WEXITED) == 0 && p->p_state == PRS_ZOMBIE) { - error = ESRCH; - break; - } wait_fill_siginfo(p, siginfo); wait_fill_wrusage(p, wrusage); - if (p->p_state == PRS_ZOMBIE) { - proc_reap(td, p, status, options); - goto exit_unlocked; - } - if (wait6_check_alive(td, options, p, status, siginfo)) goto exit_unlocked; diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 608771b9f38c..a605633fbca5 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -295,7 +295,8 @@ procdesc_exit(struct proc *p) KASSERT(pd->pd_fpcount > 0, ("%s: closed procdesc %p", __func__, pd)); pd->pd_flags |= PDF_EXITED; - pd->pd_xstat = KW_EXITCODE(p->p_xexit, p->p_xsig); + pd->pd_xexit = p->p_xexit; + pd->pd_xsig = p->p_xsig; selwakeup(&pd->pd_selinfo); KNOTE_LOCKED(&pd->pd_selinfo.si_note, NOTE_EXIT | NOTE_PDSIGCHLD); @@ -337,6 +338,25 @@ procdesc_fork(struct proc *p, pid_t child_pid) PROC_UNLOCK(p); } +void +procdesc_fill_winfo(struct procdesc *pd, bool proc_locked) +{ + struct proc *p; + + sx_assert(&proctree_lock, SA_XLOCKED); + + if ((pd->pd_flags & (PDF_EXITED | PDF_EXIT_INFO)) == PDF_EXITED) { + pd->pd_flags |= PDF_EXIT_INFO; + p = pd->pd_proc; + if (!proc_locked) + PROC_LOCK(p); + wait_fill_siginfo(p, &pd->pd_siginfo); + wait_fill_wrusage(p, &pd->pd_wrusage); + if (!proc_locked) + PROC_UNLOCK(p); + } +} + /* * When a process descriptor is reaped, perhaps as a result of close(), release * the process's reference on the process descriptor. @@ -350,6 +370,7 @@ procdesc_reap(struct proc *p) KASSERT(p->p_procdesc != NULL, ("procdesc_reap: p_procdesc == NULL")); pd = p->p_procdesc; + procdesc_fill_winfo(pd, false); pd->pd_proc = NULL; p->p_procdesc = NULL; procdesc_free(pd); @@ -458,7 +479,7 @@ procdesc_poll(struct file *fp, int events, struct ucred *active_cred, revents = 0; pd = fp->f_data; PROCDESC_LOCK(pd); - if (pd->pd_flags & PDF_EXITED) + if ((atomic_load_int(&pd->pd_flags) & PDF_EXITED) != 0) revents |= POLLHUP; else selrecord(td, &pd->pd_selinfo); @@ -491,7 +512,7 @@ procdesc_kqops_event(struct knote *kn, long hint) * pending. */ p = pd->pd_proc; - if ((pd->pd_flags & PDF_EXITED) != 0) + if ((atomic_load_int(&pd->pd_flags) & PDF_EXITED) != 0) event = NOTE_EXIT | NOTE_PDSIGCHLD; else if ((atomic_load_int(&p->p_flag) & (P_STOPPED_SIG | P_STOPPED_TRACE)) != 0) @@ -509,7 +530,7 @@ procdesc_kqops_event(struct knote *kn, long hint) /* Report exit status */ if ((kn->kn_fflags & NOTE_EXIT) != 0) - kn->kn_data = pd->pd_xstat; + kn->kn_data = KW_EXITCODE(pd->pd_xexit, pd->pd_xsig); /* Process is gone, so flag the event as finished. */ if ((event & NOTE_REAP) != 0 || diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index bb486d9026ba..f912f8787fd9 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -71,10 +71,15 @@ struct procdesc { /* * In-flight data and notification of events. */ - int pd_flags; /* (p) PD_ flags. */ - u_short pd_xstat; /* (p) Exit status. */ + int pd_flags; /* (t) PD_ flags. */ struct selinfo pd_selinfo; /* (p) Event notification. */ struct mtx pd_lock; /* Protect data + events. */ + + /* Exit status. */ + u_int pd_xexit; + u_int pd_xsig; + struct __wrusage pd_wrusage; + siginfo_t pd_siginfo; }; /* @@ -89,6 +94,7 @@ struct procdesc { /* * Flags for the pd_flags field. */ +#define PDF_EXIT_INFO 0x00000001 /* Exit info calculated. */ #define PDF_EXITED 0x00000004 /* Process exited. */ /* @@ -111,6 +117,7 @@ void procdesc_new(struct proc *, int); void procdesc_finit(struct procdesc *, struct file *); pid_t procdesc_pid(struct file *); void procdesc_reap(struct proc *); +void procdesc_fill_winfo(struct procdesc *pd, bool proc_locked); int procdesc_falloc(struct thread *, struct file **, int *, int, struct filecaps *);