From nobody Wed Aug 5 15:16:39 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 4hFYsh4tfpz6nQcf for ; Wed, 05 Aug 2026 15:16:40 +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 4hFYsg70wrz3vwg for ; Wed, 05 Aug 2026 15:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785943000; 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=Ms9yTYjIiQzTIweVABsvEN3lb1WZ9gewPPu2SlejYPk=; b=lJ8TOz3SvpEJylwcMeXFTFLwo7OzPcOlDI7szxQ/OAa5fBqv8jcfO0rBlvn6/dlIj5Skz2 C6SM+o/+3ObeJO9j8UVplxI9vpfuukEN1yR/mLIqb+4sc3AepdcS77PGXUNG6UfavB2F05 LtlN/hSX1eWK53d0MkeH4piQq3o20w2cfxgPRi77pTpIkh4bLQzoWwoX8/nonyjlYEKcoZ 4L9lWpP3ry/zKIdAWqSwmtGcJbXIeyFXIL1RmDZO1RVhfqpjSPLc6Qjp8ud0sr/WvBzJPJ aUnbxdw2O95u+JnZFx/sYlbxqYzo9F48+d32HfZiD6fOsAMirAJpGuFxSJPZ5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785943000; a=rsa-sha256; cv=none; b=F/PjJ8UshMUDe0gotNH5ghkwWEPKGCsGNBy2qMpcIq0nFR2N9N7u7M7y/XUwWJeH+gA8Xm UJ4HQyaS5M751IyoISuVbU/NVKdr+VJ/6mlJcGsfwYsIKGW5+tljufqtMguGdkHfUE9jUV VvDHHaGV0tjT2scva7FMhdqvecsMYe/1cYgBluOnh4SUfPWvB/W/9L8Mw1kixVJFSV5C7h BKkhn3qJPN7iWKLBxzCaFhPrZUN/CJzi4n9boNOQVFGQIEf4CrpNAjiHlGjmb7X8LCDd61 cRUTUHBLS8R/urOKPaYhq+5B5Qckm6AjZDrMR2uA/OKEnSxf2FLl+70+qnh1jQ== 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=1785943000; 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=Ms9yTYjIiQzTIweVABsvEN3lb1WZ9gewPPu2SlejYPk=; b=oBMpvBYOEtYA2o2kYqIMLpsOeedyoyUGBTaZ5Ad912Aju1cDnD+3k2MtPocLD0vpJUlnGy Suh1xSzAJQW8cp22xfAxW6K5eiUh4g9Y8hcxlDQq2lglNhD8q8KEk4tDpOJMzCAbZEQ/iU Oe2HI4/tNs0k1FyxI0zvvwWNCb/yM+OpqzD/S66wwmYeKqPmPfFfghOnZ+j4E/M+EV32S1 DMIQgxN3J/yPZ4yysZafU0WFBR26A60Z4hZQi3tgxWMAGQYuD2o/WGpYzJqYhdqLSop6/j aDnOnL1B95+SGf2DV3fRbwhfuULwvU7q/6+Z8YFHQ9izsy/X/06zS1n0SNeYbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYsg65Fgzftc for ; Wed, 05 Aug 2026 15:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45f23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7d914975a6ab - stable/14 - procstat: Add handling for inotify descriptors 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d914975a6ab45c5e1b2a11a864b0bcb136b90ab Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:39 +0000 Message-Id: <6a7353d7.45f23.17826409@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d914975a6ab45c5e1b2a11a864b0bcb136b90ab commit 7d914975a6ab45c5e1b2a11a864b0bcb136b90ab Author: Mark Johnston AuthorDate: 2025-06-09 20:11:08 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:15 +0000 procstat: Add handling for inotify descriptors MFC after: 3 months Sponsored by: Klara, Inc. (cherry picked from commit f56e0d4755c521b50bf313a85fd399c2b6a7a4bb) --- usr.bin/procstat/procstat.1 | 3 +++ usr.bin/procstat/procstat_files.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index 4813f112a725..d27209e7a13b 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -377,6 +377,8 @@ eventfd fifo .It h shared memory +.It i +inotify descriptor .It k kqueue .It m @@ -862,6 +864,7 @@ procstat: procstat_getprocs() .Xr sockstat 1 , .Xr cap_enter 2 , .Xr cap_rights_limit 2 , +.Xr inotify 2 , .Xr mlock 2 , .Xr mlockall 2 , .Xr libprocstat 3 , diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index fc1336f14c84..3810e084bc11 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -226,6 +226,10 @@ static struct cap_desc { { CAP_BINDAT, "ba" }, { CAP_CONNECTAT, "ca" }, + /* Inotify descriptor rights. */ + { CAP_INOTIFY_ADD, "ina" }, + { CAP_INOTIFY_RM, "inr" }, + /* Aliases and defines that combine multiple rights. */ { CAP_PREAD, "prd" }, { CAP_PWRITE, "pwr" }, @@ -416,6 +420,11 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp) xo_emit("{eq:fd_type/eventfd}"); break; + case PS_FST_TYPE_INOTIFY: + str = "i"; + xo_emit("{eq:fd_type/inotify}"); + break; + case PS_FST_TYPE_NONE: str = "?"; xo_emit("{eq:fd_type/none}");