From nobody Tue Oct 15 15:05:27 2024 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 4XScpv5hzzz5Z3Hb; Tue, 15 Oct 2024 15:05:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XScpv3XGFz45yH; Tue, 15 Oct 2024 15:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729004727; 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=UkPmK0fVL31Kkr+9L9dLMMP3a9ORiJBWK+LwpEP8eps=; b=xhXVxd57bhGYOImDoXpV6x3jG93GxkyDAepYEWESku1vwDb/QpAVLTjXNh2KD7wwf3q0ZS j2MUj6KQ6E8VzyaZK5ZerMFiiciCgbSfksGgAd0Cwgzjj4XtqEcalP6RuO203uJIYxjAns F2bxfno/VxCyFFFHfAKsfGnSc2SDED3rYnrTXrfWK8+oFxG0sJ+ltjbnxFFyyn+PhveE7n xWzIjbbKKc/Ks/FXyi1O8g7qK8u/TTqVOh8usMZB79u0Qo7jEEs70XuaCvBI8NEksfUZUz v3eccszPd53kDmEwzItc+rYzDHSFMWCdm++ah/cWUYRWn2MhGuOaBn4JXc7ujw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729004727; 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=UkPmK0fVL31Kkr+9L9dLMMP3a9ORiJBWK+LwpEP8eps=; b=SAfYWk4aGWUfFk/Ou6g3FxEp/asoLnwBSkRk6+2wC0TQ0UwHzzVBUx7WrRHkzx91llXmZi mk8CSG1SV5X7lFUaKHMeb20rP9UVXXV8bSjf222lyHe24wJ3HICJJvAOsbKvkBx2jDzZ83 kz8B9KvzaDDsgxacHF/QVV8j/zKE1aoD6qopVRLJdlQhEYVEmbe3PuekoSdd32yzojxEA3 WR6NHBFDRwmzLwmn+CXtgic/iwRFJSghqqfwLw9+7KoRHCr8mW4n2mzOcHR+it6C0Gfyds 4oYRLsC1NZgdBNlvLswUgWvwjAiPPb+oWqxbVSPfaVtydfsO0vz1Wih0/NcaIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729004727; a=rsa-sha256; cv=none; b=TeLk9eH8pPuggkAF+0Kexzh3++pGjM44E3E3nG6+dHyirmDRgqCE4lgQZAtD9lVf34ViAh Jb0sNz8TNxYyh5OguIhB9DIwwBHLPOXxL9xV0poQ3zDdoCiwE78DdRxZVekHShVMjZTUKU XEtcsbkwsTfhyqjSyIfS6JeOA3ksBghPBvHf3Or1Pjn8ff7NHLK27lGqkSyCBsyEKvUQJy yVPafMidASKK5y+hFpB3KQeKJfSPtAwtS29NoVTspaYTgwOnpOvia+evgGK1y+ksdiM1Qy ql8pXqoVf5QWRHC2ohWQChx8KdNvZMKw1gCSE9sEHpbC/pxbL+xefY8ybpxDYw== 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 4XScpv381dzRT5; Tue, 15 Oct 2024 15:05:27 +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 49FF5RcV089325; Tue, 15 Oct 2024 15:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FF5RXI089322; Tue, 15 Oct 2024 15:05:27 GMT (envelope-from git) Date: Tue, 15 Oct 2024 15:05:27 GMT Message-Id: <202410151505.49FF5RXI089322@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: cde459e2206c - stable/14 - procstat vm: report SysV shm segment mapping 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cde459e2206c834a8b11ca7a257fadab10c4cac1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cde459e2206c834a8b11ca7a257fadab10c4cac1 commit cde459e2206c834a8b11ca7a257fadab10c4cac1 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:34:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-15 14:50:16 +0000 procstat vm: report SysV shm segment mapping (cherry picked from commit 65b832eb6ff76464a65cbf6ba730a54364a5fdc2) --- usr.bin/procstat/procstat_vm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c index 26a8fee57d1c..4f69aa3c3244 100644 --- a/usr.bin/procstat/procstat_vm.c +++ b/usr.bin/procstat/procstat_vm.c @@ -115,6 +115,8 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) KVME_FLAG_GROWS_DOWN ? "true" : "false"); xo_emit("{en:wired/%s}", kve->kve_flags & KVME_FLAG_USER_WIRED ? "true" : "false"); + xo_emit("{en:sysvshm/%s}", kve->kve_flags & + KVME_FLAG_SYSVSHM ? "true" : "false"); xo_close_container("kve_flags"); switch (kve->kve_type) { case KVME_TYPE_NONE: @@ -165,6 +167,10 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) } xo_emit("{d:kve_type/%-2s} ", str); xo_emit("{e:kve_type/%s}", lstr); + if ((kve->kve_flags & KVME_FLAG_SYSVSHM) != 0) + xo_emit(" {:sysvipc:/sysvshm(%ju:%u)/%ju:%u}", + (uintmax_t)kve->kve_vn_fileid, + kve->kve_vn_fsid_freebsd11); xo_emit("{:kve_path/%-s/%s}\n", kve->kve_path); xo_close_instance("vm"); }