From nobody Sun Aug 16 02:46:55 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 4hN0jX1b72z6pH1r for ; Sun, 16 Aug 2026 02:46: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hN0jW2h6jz3fLs for ; Sun, 16 Aug 2026 02:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848415; 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=xPgMRMDjqudA0x2pUbO115or373hfG3iEy+SYaciSm4=; b=JT958g6X4EAU3ORXFOBIsvqaI9GcO+/+1G5wnkeOqk1Ag6uolyuAUZfj82HVAdrfKLPB+r a7FanrbXMRbxeLSmxeQ+Vyt3qe8SuoGSIRet6JyexGzqQ8+wzqUMXymtFTJk0SZvoy18Wd IslkOv4Q1kdaIpBvm+Oaq/T/0lCFSgiSle79aMsFdB4XcEOhY9pwVopMc3/hUgepquvUsZ OTsTmE5+AocTr5sYHdwu/zWFHL6JrB7EZTq59ZrzaapNArIqpCrECUVPy0MtngdFCECrTf xK0vThLpBahwE0NTE2e5t4mmkVy86vSd3noihqHvPH1MnDQ9KEHoJXnYiWiK1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848415; a=rsa-sha256; cv=none; b=P0XyHLsu/O4cCYNmYBuxRzvn64x6ehUiOiDcWTG+/vcCAi+WjVruVz6q4yGXFeum7PbQ2+ 8eAGp9KHjb660hFmmBIve6xfum+TY2hxquHfofkJlZPMRcp+qbosM1rFGIKtM3a800ygBK +QzYEexsKdTQX8dndQQnyG2QpMyd4biWYwc2ceTuRZX6urnhhy9anbIgRsFTFXY2MkGCBd B8xQPWFCeX6Yzg060E/s+kHr0DBNDlxRcYx0TzdmO5BBbKVqVKwEowHeKEGgkllzwDHOBY t1h5lTOka703hkni2L9nJzTkKlvDTA1wZgRUgf4hdG+rrIrySlPD8zet8z1NHA== 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=1786848415; 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=xPgMRMDjqudA0x2pUbO115or373hfG3iEy+SYaciSm4=; b=dusHuB629gef/V5OjxngpuGWIstlEQB02X7WEpgLCIs37RSOzQ9kt7GFlJqpBPkf3Bn5x2 +79wzAxqz2JB81SBijIBChEPTfU6nAApNGLxVWED8fMNVN7r+YxEiqqu3WQ/UFm2PVU8G8 IJ9Llo2te7L+V6hOSl7rfiQn4VpMisSzVmW9ZDhC6c0bUTaHZmIemVtC0QiLqgqSeffh9l eFpQfWPLMXZkckVyZexTEPYx2IMHT2BIPnj/diFzpstf69sGOXRMSV+go2zz/pKEFVcUTd 1NEz2/c9ZUGJmpsEf0+zshzhYtWkffWeruFkehzE8lX+kFGRQ2D9AAmdUMGjSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0jW1Bygz188y for ; Sun, 16 Aug 2026 02:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44586 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:46:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 547751e4efce - stable/15 - procdesc: add NOTE_PDSIGCHLD 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: 547751e4efcef869344d4ea8d4906f3b7817ff4f Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:46:55 +0000 Message-Id: <6a81249f.44586.1003d320@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=547751e4efcef869344d4ea8d4906f3b7817ff4f commit 547751e4efcef869344d4ea8d4906f3b7817ff4f Author: Konstantin Belousov AuthorDate: 2026-07-09 11:08:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:29 +0000 procdesc: add NOTE_PDSIGCHLD (cherry picked from commit 2a5e58c59694bc719d7ab82abb1c65ee2045329d) --- sys/kern/kern_sig.c | 2 ++ sys/kern/sys_procdesc.c | 23 ++++++++++++++++++++--- sys/sys/event.h | 4 +++- sys/sys/procdesc.h | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index defba6848409..c2561b490f78 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2315,6 +2315,7 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) ps = p->p_sigacts; KNOTE_LOCKED(p->p_klist, NOTE_SIGNAL | sig); + procdesc_jobstate(p); prop = sigprop(sig); if (td == NULL) { @@ -3682,6 +3683,7 @@ childproc_jobstate(struct proc *p, int reason, int sig) */ p->p_pptr->p_flag |= P_STATCHILD; wakeup(p->p_pptr); + procdesc_jobstate(p); ps = p->p_pptr->p_sigacts; mtx_lock(&ps->ps_mtx); diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 71e8f6797d47..0c6b430b7f39 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -64,6 +64,7 @@ #include #include +#include #include #include #include @@ -347,7 +348,7 @@ procdesc_exit(struct proc *p) return (1); } selwakeup(&pd->pd_selinfo); - KNOTE_LOCKED(&pd->pd_selinfo.si_note, NOTE_EXIT); + KNOTE_LOCKED(&pd->pd_selinfo.si_note, NOTE_EXIT | NOTE_PDSIGCHLD); PROCDESC_UNLOCK(pd); /* Wakeup all waiters for this procdesc' process exit. */ @@ -355,6 +356,21 @@ procdesc_exit(struct proc *p) return (0); } +void +procdesc_jobstate(struct proc *p) +{ + struct procdesc *pd; + + PROC_LOCK_ASSERT(p, MA_OWNED); + pd = p->p_procdesc; + if (pd == NULL) + return; + + PROCDESC_LOCK(pd); + KNOTE_LOCKED(&pd->pd_selinfo.si_note, NOTE_PDSIGCHLD); + PROCDESC_UNLOCK(pd); +} + /* * When a process descriptor is reaped, perhaps as a result of close(), release * the process's reference on the process descriptor. @@ -502,10 +518,11 @@ procdesc_kqops_event(struct knote *kn, long hint) pd = kn->kn_fp->f_data; if (hint == 0) { /* - * Initial test after registration. Generate a NOTE_EXIT in + * Initial test after registration. Generate notes in * case the process already terminated before registration. */ - event = pd->pd_flags & PDF_EXITED ? NOTE_EXIT : 0; + event = (pd->pd_flags & PDF_EXITED) != 0 ? (NOTE_EXIT | + NOTE_PDSIGCHLD) : 0; } else { /* Mask off extra data. */ event = (u_int)hint & NOTE_PCTRLMASK; diff --git a/sys/sys/event.h b/sys/sys/event.h index 16fc829fc8ea..dfba8bc83032 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -205,10 +205,12 @@ struct freebsd11_kevent32 { #define NOTE_EXIT 0x80000000 /* process exited */ #define NOTE_FORK 0x40000000 /* process forked */ #define NOTE_EXEC 0x20000000 /* process exec'd */ +#define NOTE_PDSIGCHLD 0x10000000 /* procdesc: pdwait() info + available */ #define NOTE_SIGNAL 0x08000000 /* process received a signal, shared with EVFIL_SIGNAL */ #define NOTE_REAP 0x04000000 /* process reaped */ -#define NOTE_PCTRLMASK 0xec000000 /* mask for hint bits */ +#define NOTE_PCTRLMASK 0xfc000000 /* mask for hint bits */ #define NOTE_PDATAMASK 0x000fffff /* mask for pid */ /* additional flags for EVFILT_PROC */ diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index b332f73744de..dafa3326384d 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -104,6 +104,7 @@ struct procdesc { int procdesc_exit(struct proc *); int procdesc_find(struct thread *, int fd, const cap_rights_t *, struct proc **); +void procdesc_jobstate(struct proc *p); int kern_pdgetpid(struct thread *, int fd, const cap_rights_t *, pid_t *pidp); void procdesc_new(struct proc *, int);