From nobody Mon Jul 27 10:17:16 2026 X-Original-To: dev-commits-src-main@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 4h7vfP1Xyjz6mlHN for ; Mon, 27 Jul 2026 10:17:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7vfP0ygpz3L8S for ; Mon, 27 Jul 2026 10:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785147437; 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=VTdtUen4B7Jqm58Xbl2h/JPpxsdtS4Hcrez0fllvBmM=; b=yllYQ0co0UM4iEidnpYRSz7HaEHUYGMS15jlimMpxzA7PnHZ8t7VvaBG3ZRF/Z2PnEpMkg lxxSfp6LyKmnEV2lso5psZoKbH7Vz3zcSwRQGAlsNu4M526/08Dbc/bQ0bFiGbppS3ezdI 1NhBSWneFFsgZVsnyyo5LOR/Bf4DIfYg0Er50iUb7Vx6VuQ8HwZOo06G1ZeiAFMVf3kzd6 mEJpx0rvR0+0Q1CuWsyRRlXDAH/Kl5gDOe/S0rPwhO9CIDXirnVLbfV+b4jClFvF11cYAp 6cFVN8dDuG5b70vD+GCa71acEdedcl2c8hxx/KXSp0cZ8mLt5h4TWcQ1SVPpbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785147437; a=rsa-sha256; cv=none; b=ujVzRnjAEROWbdqQ9LX3UnD0yXFjY7qMfTHmfD6kxN+BgixTLgZM5osStZsjbiU0DE/xH/ 254i+Kkson3Jz72CphBKmqa6j4Xc3w7PNYgrAfYpMGsGbQS92k/cBFDi/mFJkL5fc7DyJe RBny0bPAro9k9Rl9LIosZ1q0ewJu00mOOOoJakMMl5LTBrJtMudxtD777jLs/BpN2NIMBM gQQd/hzFcuJ4Sg/vvg4HwmOWe86zttPqqOQibcxxr45McAriWKetVi4okzjbx4Rmyvrr/j 2vsiREYOCoHCn4LhHfTxtjJjlWVm2oT3cvt7Jl+hn4qpBBpQYw5puquHLiGzrg== 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=1785147437; 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=VTdtUen4B7Jqm58Xbl2h/JPpxsdtS4Hcrez0fllvBmM=; b=XQnkIK/zBnUKcVAObrBP6F2lOgLqLG2DwO5iEeLFmBl4g4YH9FZ3j9uMPj6P+Gcbb4IyUm WoS22FqvUgEDOwYESTV+9UyQuccilk0KKCP99XYbiZNMyisqYwETXh76do+G0NPQtrmsZI k71G8DJI4c8h012ab2k/zolyyc3LTs/9nQslDA4zQQJb5u6HR1vIMrwEbm3bzWbTx6a1ck MQ8xLSjKZ7gyTXNOuDslMzeCgDYJIW1VfESltj9/IqTkZ0XcPzvFzWo//dXy0NhRVE2TFw C1KG/0j75ixTE0Uox27kk91PMX+Q/9NY0DEtRrY1fWkPA2o19aI9Jz/AglUl1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7vfN6fRKz13b9 for ; Mon, 27 Jul 2026 10:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 10:17:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2bacbbecb165 - main - kqueue: Add NOTE_REAP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bacbbecb165dd761ea7ec2fc35630db61508cdf Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 10:17:16 +0000 Message-Id: <6a67302c.1d4fb.541934be@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2bacbbecb165dd761ea7ec2fc35630db61508cdf commit 2bacbbecb165dd761ea7ec2fc35630db61508cdf Author: Dag-Erling Smørgrav AuthorDate: 2026-07-27 10:15:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-27 10:15:26 +0000 kqueue: Add NOTE_REAP Add a NOTE_REAP event for EVFILTER_PROC which provides a notification when the process is reaped. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D58313 --- lib/libsys/kqueue.2 | 10 ++++++++-- lib/libsysdecode/flags.c | 2 +- sys/kern/kern_event.c | 13 ++++++++----- sys/kern/kern_exit.c | 1 + sys/kern/sys_procdesc.c | 9 ++++++--- sys/sys/event.h | 11 ++++------- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/lib/libsys/kqueue.2 b/lib/libsys/kqueue.2 index d2c6ed102f29..6d2a10b1b139 100644 --- a/lib/libsys/kqueue.2 +++ b/lib/libsys/kqueue.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 24, 2026 +.Dd July 22, 2026 .Dt KQUEUE 2 .Os .Sh NAME @@ -543,9 +543,15 @@ The exit status will be stored in .Va data in the same format as the status returned by .Xr wait 2 . +.It Dv NOTE_REAP +The process has been reaped by a call to the +.Xr wait 2 +family of functions. .It Dv NOTE_FORK The process has called -.Fn fork . +.Xr fork 2 +or +.Xr vfork 2 . .It Dv NOTE_EXEC The process has executed a new process via .Xr execve 2 diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index 880fe5e1ed49..b9af84a1ef52 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -377,7 +377,7 @@ static struct name_table kevent_vnode_fflags[] = { }; static struct name_table kevent_proc_fflags[] = { - X(NOTE_EXIT) X(NOTE_FORK) X(NOTE_EXEC) X(NOTE_PDSIGCHLD) + X(NOTE_EXIT) X(NOTE_FORK) X(NOTE_EXEC) X(NOTE_PDSIGCHLD) X(NOTE_REAP) X(NOTE_TRACK) X(NOTE_TRACKERR) X(NOTE_CHILD) XEND }; diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index f22d8ca7da11..23e9d309f74c 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -445,7 +445,7 @@ filt_procattach(struct knote *kn) bool exiting, immediate; exiting = immediate = false; - if (kn->kn_sfflags & NOTE_EXIT) + if (kn->kn_sfflags & (NOTE_EXIT | NOTE_REAP)) p = pfind_any(kn->kn_id); else p = pfind(kn->kn_id); @@ -470,7 +470,7 @@ filt_procattach(struct knote *kn) kn->kn_flags &= ~EV_FLAG2; kn->kn_data = kn->kn_sdata; /* ppid */ kn->kn_fflags = NOTE_CHILD; - kn->kn_sfflags &= ~(NOTE_EXIT | NOTE_EXEC | NOTE_FORK); + kn->kn_sfflags &= ~NOTE_PCTRLMASK; immediate = true; /* Force immediate activation of child note. */ } /* @@ -532,12 +532,15 @@ filt_proc(struct knote *kn, long hint) if ((kn->kn_sfflags & event) != 0) kn->kn_fflags |= kn->kn_sfflags & event; + /* Report exit status */ + if ((kn->kn_fflags & NOTE_EXIT) != 0) + kn->kn_data = KW_EXITCODE(p->p_xexit, p->p_xsig); + /* Process is gone, so flag the event as finished. */ - if ((event & NOTE_EXIT) != 0) { + if ((event & NOTE_REAP) != 0 || + ((event & NOTE_EXIT) != 0 && (kn->kn_sfflags & NOTE_REAP) == 0)) { kn->kn_flags |= EV_EOF | EV_ONESHOT; kn->kn_ptr.p_proc = NULL; - if (kn->kn_fflags & NOTE_EXIT) - kn->kn_data = KW_EXITCODE(p->p_xexit, p->p_xsig); if (kn->kn_fflags == 0) kn->kn_flags |= EV_DROP; return (1); diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 43d0c2da38c1..2aa756bd00d2 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1055,6 +1055,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) sx_xunlock(&proctree_lock); PROC_LOCK(p); + KNOTE_LOCKED(p->p_klist, NOTE_REAP); knlist_detach(p->p_klist); p->p_klist = NULL; PROC_UNLOCK(p); diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 862b59262d0c..608771b9f38c 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -507,11 +507,14 @@ procdesc_kqops_event(struct knote *kn, long hint) if ((kn->kn_sfflags & event) != 0) kn->kn_fflags |= kn->kn_sfflags & event; + /* Report exit status */ + if ((kn->kn_fflags & NOTE_EXIT) != 0) + kn->kn_data = pd->pd_xstat; + /* Process is gone, so flag the event as finished. */ - if ((event & NOTE_EXIT) != 0) { + if ((event & NOTE_REAP) != 0 || + ((event & NOTE_EXIT) != 0 && (kn->kn_sfflags & NOTE_REAP) == 0)) { kn->kn_flags |= EV_EOF | EV_ONESHOT; - if (kn->kn_fflags & NOTE_EXIT) - kn->kn_data = pd->pd_xstat; if (kn->kn_fflags == 0) kn->kn_flags |= EV_DROP; return (1); diff --git a/sys/sys/event.h b/sys/sys/event.h index 9b8a3ba2bcf1..1944a7c2706a 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -209,7 +209,10 @@ struct freebsd11_kevent32 { #define NOTE_EXEC 0x20000000 /* proc: process exec'd */ #define NOTE_PDSIGCHLD 0x10000000 /* procdesc: pdwait() info available */ -#define NOTE_PCTRLMASK 0xf0000000 /* mask for hint bits */ +#define NOTE_SIGNAL 0x08000000 /* process received a signal, + shared with EVFIL_SIGNAL */ +#define NOTE_REAP 0x04000000 /* process reaped */ +#define NOTE_PCTRLMASK 0xfc000000 /* mask for hint bits */ #define NOTE_PDATAMASK 0x000fffff /* mask for pid */ /* additional flags for EVFILT_PROC */ @@ -263,12 +266,6 @@ struct knlist { #define KNLIST_EMPTY(list) SLIST_EMPTY(&(list)->kl_list) -/* - * Flag indicating hint is a signal. Used by EVFILT_SIGNAL, and also - * shared by EVFILT_PROC (all knotes attached to p->p_klist) - */ -#define NOTE_SIGNAL 0x08000000 - /* * Hint values for the optional f_touch event filter. If f_touch is not set * to NULL and f_isfd is zero the f_touch filter will be called with the type