From nobody Fri Jul 4 14:56:07 2025 X-Original-To: dev-commits-src-all@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 4bYcCD3h1Jz61HLp; Fri, 04 Jul 2025 14:56:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYcCD1JVFz436T; Fri, 04 Jul 2025 14:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640968; 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=ivBG9jyMZKWMPaaELExpzW5S4h/xnKqc5Snj3CbHbGo=; b=qwOEadvOqimezz1YJi4eCRoI8yzjqL7GLD3CnNRkkZTcK8OfQ8t4Ej+v7pI4n2XbZL+K6l bPfOVR+YWQzIqRsV4XT+C7R1u8TPy2MDSLGNsi5J/EfsKOWbC861/nDGKZxmYGkTkReIUg yPz1T5jJAREoIGu4ffEzP+wRORXA+jYB6r+hIE49gE8GBwtzHdcKG2zkmVaXV/zn5z5fJk 9OmtVoD1Be13jmIRSddeIrbdmiWkHIgrAo7KGhiObUQHfcDQyFyMhzEWusrotgocxn6K5v GV3N0iqRodtCxyD8Ao8ERCH4c3TK3W8ZDuUf6G6SEf5swoYDRUUvvEOQMtGlAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640968; 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=ivBG9jyMZKWMPaaELExpzW5S4h/xnKqc5Snj3CbHbGo=; b=KhEAuhKoZg7WN9BR1y0WZnbn8XzZKRPQeA++Kir0MrH7IaK7yMvkSePMmpfkBuOUho0/7r 98aBT9ieUkVYDqYZRWRIgaiydP0AN/at2ip8FaBuBRjNkQk8MqnxqUzH0SuTTv2g1G9Zm2 /O2Uqa1pAZxuhwmqMqwXMqMEhPWd5NJllixgLJOtYkxd+3wqfXKx2f4yo6cnZOXHmjgqYF GfPNkEunIJJsKxmAeBMI8mbyU+T4SqJMQsOqNv4NzZC1up0YnM/A6JZ0Zb/tnVuzRilx6U dNyrb7wdxfoZ1glqqDCxekXA53idVpe11Qxg2NC5ZTlSfh/xsgZV3NCxW+uzQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751640968; a=rsa-sha256; cv=none; b=Qy+YFSwQT5HxtEPDDUD6o9x0D8BvTIQHF3zl9Y1UfQb68hMzJ/PatShDq14Oa3lQafjqAl GoHo27TP2LtzsAbkE6thczh36nnxdReMMIFqEoMkvY5C2omHb2o1co/iGc9WA3x8OugR5J GWVqL+YldR2/NeopmeG4Ysuhw6yCkRpBIfWezh4yhH4pgLXQDTRPYEQjQ6lqB0x78t0EbT p8Q6WhGkDlAFBgDjMcmmx66OQChEe5Ez1hZrcCDpV+Fwu7BLOrgDrRjV76iIGBwUUdxO2i qkxWqP9yY2gaMnTwzFk03OxsVWbZt8e4RyZkxwDAMjPlFBGnLG47wVWqEde65g== 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 4bYcCD0CFGzvm2; Fri, 04 Jul 2025 14:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 564Eu79U073928; Fri, 4 Jul 2025 14:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564Eu76S073925; Fri, 4 Jul 2025 14:56:07 GMT (envelope-from git) Date: Fri, 4 Jul 2025 14:56:07 GMT Message-Id: <202507041456.564Eu76S073925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f56e0d4755c5 - main - procstat: Add handling for inotify descriptors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: f56e0d4755c521b50bf313a85fd399c2b6a7a4bb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f56e0d4755c521b50bf313a85fd399c2b6a7a4bb commit f56e0d4755c521b50bf313a85fd399c2b6a7a4bb Author: Mark Johnston AuthorDate: 2025-06-09 20:11:08 +0000 Commit: Mark Johnston CommitDate: 2025-07-04 14:42:34 +0000 procstat: Add handling for inotify descriptors MFC after: 3 months Sponsored by: Klara, Inc. --- 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 cc775ffe133b..1e05e235e619 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 d61cf1693053..aa4850632aa7 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}");