From nobody Sun Apr 23 06:24:36 2023 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 4Q3ysd41Bhz46w3t; Sun, 23 Apr 2023 06:24:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3ysc6Yg0z3jgq; Sun, 23 Apr 2023 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682231076; 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=rlZuSSJGHL6LDzq9Xn4He26TuPLFypOZhsuRYGHbvfw=; b=rpRUZfaHtDqGMxEYghNCAtzkr9bs4mR/4ItGPV+9zPzdCR50909OTt5mUNZLN0I5ZnKoJs G9vlwwWfsdCA4DfqNUyqVMz7sIBNjnNZow3UxjjrsTGXhBC/wjpDL+2vS08hb1nMTt8Ug6 z6g2PFMRI/VglT8kyy1TcXjeHf5ueUUga4RT2UEBYBd4sg8iSy7+5QRrYDRVSkpQt4g0wu aOuxTZ1xiV1bEQ1bIGpeKTVCZE18hcpHCQWoIjWftrEYinkmH1zIh83lr9OSxy905aOkva xz1RRh5PxdrX3veFzdGH6aCo53eR2nzsqwlguEB4U1cJiXoOVvjZvZRX5D52Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682231076; 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=rlZuSSJGHL6LDzq9Xn4He26TuPLFypOZhsuRYGHbvfw=; b=BM8ZgvIl6mu9ealS+QFU2xlaL+R3MH6Ow9M4vn3f/7pLPwiB9H5JkhFDzATGP5FYJuNMoQ etfjFj3lrCGjkS/Zts3JWHSf8WBIIHZxcqTkHQtX+UO9iIIWQ+62Guzk+9IVBtICoQTl52 1PA+PimkGxxNlX9Y8e/KsiHKfp9lE0f8GtX/f1yVNFbL+w+IiCVCZAoPvOM88hmXAIYVEi wd6tYzigrQoel9kav3EdQu7w6LgVXVi9U2I4udaVh3PLXbqDyLBVyITrwD9fc42Zank3pW 1j/JsI2GqwiEMY1MIhDzT2TcIQBp/vq+8SMZ+flwOZh56P+fNHAU+cvCBX4v5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682231076; a=rsa-sha256; cv=none; b=UDlhh9YxANkItBlKt1CM72I0BUAj0NMhXCyAekPALVye2SMo00FoKjYvKHSDrwow9Q2wcJ SVQcZ4iR3t2bvIX+/2iqPe/8NNhyPumg54VYcDh0wp25rD0xe/SoAF9FQztORsRDsCYtKD 81DmHBXuPxEIpFSWaW6yDjxwFBZEHsgTigoDX5RCJC5Svep8coSfu1e7CUxK1RksVw0sPo CZvS2XbmwEQxLyP40Q65r4pdqytZjk+7a+YxrfCTSn8EcrZqzzcDyQ63wpE1b9uG1GQl/2 wuYsy5YxRtdL3OYRzydHxlW5NcuveEpDSrvMYFNZDi0x0VtPCcWfXIOxEu+Shg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3ysc3yrSzY3s; Sun, 23 Apr 2023 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N6OaHH086905; Sun, 23 Apr 2023 06:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N6Oahb086904; Sun, 23 Apr 2023 06:24:36 GMT (envelope-from git) Date: Sun, 23 Apr 2023 06:24:36 GMT Message-Id: <202304230624.33N6Oahb086904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c34e421db383 - stable/13 - procctl: add state flags to PROC_REAP_GETPIDS reports 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: c34e421db38321678ee3298d3a4c209130e7910c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c34e421db38321678ee3298d3a4c209130e7910c commit c34e421db38321678ee3298d3a4c209130e7910c Author: Val Packett AuthorDate: 2023-04-15 17:59:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-23 06:23:31 +0000 procctl: add state flags to PROC_REAP_GETPIDS reports (cherry picked from commit 77f0e198d9134b6ca2650d3a84d7db2d786ec0c0) --- lib/libc/sys/procctl.2 | 10 ++++++++-- sys/kern/kern_procctl.c | 6 ++++++ sys/sys/procctl.h | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index 02979e934451..89e4f2d33c64 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 2021 +.Dd April 15, 2023 .Dt PROCCTL 2 .Os .Sh NAME @@ -302,7 +302,7 @@ of the process. The .Fa pi_flags field returns the following flags, further describing the descendant: -.Bl -tag -width REAPER_PIDINFO_REAPER +.Bl -tag -width REAPER_PIDINFO_EXITING .It Dv REAPER_PIDINFO_VALID Set to indicate that the .Vt procctl_reaper_pidinfo @@ -320,6 +320,12 @@ field identifies the direct child of the reaper. .It Dv REAPER_PIDINFO_REAPER The reported process is itself a reaper. The descendants of the subordinate reaper are not reported. +.It Dv REAPER_PIDINFO_ZOMBIE +The reported process is in the zombie state, ready to be reaped. +.It Dv REAPER_PIDINFO_STOPPED +The reported process is stopped by a SIGSTOP/SIGTSTP signal. +.It Dv REAPER_PIDINFO_EXITING +The reported process is in the process of exiting (but not yet a zombie). .El .It Dv PROC_REAP_KILL Request to deliver a signal to some subset of the descendants of the reaper. diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 9d48b04dde48..a4f675c2938e 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -234,6 +234,12 @@ reap_getpids(struct thread *td, struct proc *p, void *data) pip->pi_flags |= REAPER_PIDINFO_CHILD; if ((p2->p_treeflag & P_TREE_REAPER) != 0) pip->pi_flags |= REAPER_PIDINFO_REAPER; + if ((p2->p_flag & P_STOPPED) != 0) + pip->pi_flags |= REAPER_PIDINFO_STOPPED; + if (p2->p_state == PRS_ZOMBIE) + pip->pi_flags |= REAPER_PIDINFO_ZOMBIE; + else if ((p2->p_flag & P_WEXIT) != 0) + pip->pi_flags |= REAPER_PIDINFO_EXITING; i++; } sx_sunlock(&proctree_lock); diff --git a/sys/sys/procctl.h b/sys/sys/procctl.h index 0fcb62e94bb9..2d4b19325bbf 100644 --- a/sys/sys/procctl.h +++ b/sys/sys/procctl.h @@ -102,6 +102,9 @@ struct procctl_reaper_pidinfo { #define REAPER_PIDINFO_VALID 0x00000001 #define REAPER_PIDINFO_CHILD 0x00000002 #define REAPER_PIDINFO_REAPER 0x00000004 +#define REAPER_PIDINFO_ZOMBIE 0x00000008 +#define REAPER_PIDINFO_STOPPED 0x00000010 +#define REAPER_PIDINFO_EXITING 0x00000020 struct procctl_reaper_pids { u_int rp_count;